Kotlin 1.8.10 + maintenance (#37)

* Update libsodium submodule, bump kotlin versions, switch to github actions
This commit is contained in:
Ugljesa Jovanovic 2023-03-26 19:12:15 +02:00 committed by GitHub
parent f268886681
commit 1cfa03a18f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 87 additions and 10 deletions

View File

@ -0,0 +1,38 @@
name: Build project and push to maven snapshot
run-name: ${{ github.actor }} after merge
on:
push:
branches:
- main
env:
CHROME_BIN: "chromium"
jobs:
Build-And-Push-Linux:
runs-on: [self-hosted, Linux, x64]
steps:
- uses: actions/checkout@v3
with:
submodules: 'true'
- run: ./linuxBuildAndPublish.sh
Build-And-Push-Mac:
runs-on: [self-hosted, macOS, ARM64]
steps:
- uses: actions/checkout@v3
with:
submodules: 'true'
- run: |
./macBuild.sh
./macBuildAndPublishSnapshot-bindings.sh
Build-And-Push-Windows:
runs-on: [self-hosted, Windows, x64]
steps:
- uses: actions/checkout@v3
with:
submodules: 'true'
- name: Build
run: |
$env:CHERE_INVOKING = 'yes'
C:\msys64\usr\bin\bash -lc "./windowsBuildAndPublish-delegated.sh"

View File

@ -0,0 +1,34 @@
name: Build project and run tests
run-name: ${{ github.actor }} pull request
on:
pull_request:
branches:
- main
env:
CHROME_BIN: "chromium"
jobs:
Build-And-Test-Linux:
runs-on: [self-hosted, Linux, x64]
steps:
- uses: actions/checkout@v3
with:
submodules: 'true'
- run: ./linuxBuild.sh
Build-And-Test-Mac:
runs-on: [self-hosted, macOS, ARM64]
steps:
- uses: actions/checkout@v3
with:
submodules: 'true'
- run: ./macBuild.sh
Build-And-Test-Windows:
runs-on: [self-hosted, Windows, x64]
steps:
- uses: actions/checkout@v3
with:
submodules: 'true'
- run: |
$env:CHERE_INVOKING = 'yes'
C:\msys64\usr\bin\bash -lc "./windowsBuild-delegated.sh"

View File

@ -28,9 +28,9 @@ repositories {
}
dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
implementation("com.android.tools.build:gradle:7.2.2")
implementation ("org.jetbrains.dokka:dokka-gradle-plugin:1.7.20")
implementation ("org.jetbrains.dokka:dokka-gradle-plugin:1.8.10")
}
System.setProperty("PROJECT_PATH", project.projectDir.parentFile.toString())

View File

@ -15,15 +15,15 @@
*/
object Versions {
val kotlinCoroutines = "1.6.3"
val kotlin = "1.7.20"
val kotlinSerialization = "1.4.0"
val kotlinCoroutines = "1.7.0-Beta"
val kotlin = "1.8.10"
val kotlinSerialization = "1.5.0"
val kotlinSerializationPlugin = kotlin
val nodePlugin = "1.3.0"
val dokkaPlugin = kotlin
val taskTreePlugin = "1.5"
val kotlinBigNumVersion = "0.3.7"
val jna = "5.10.0"
val jna = "5.13.0"
val kotlinPoet = "1.6.0"
val sampleLibsodiumBindings = "0.8.8-SNAPSHOT"
val ktor = "1.3.2"

View File

@ -4051,6 +4051,11 @@ typescript@3.9.5:
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36"
integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==
typescript@4.7.4:
version "4.7.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
ua-parser-js@^0.7.30:
version "0.7.31"
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6"

View File

@ -41,7 +41,7 @@ kotlin {
val hostOsName = getHostOsName()
runningOnLinuxx86_64 {
jvm()
js() {
js(IR) {
browser {
testTask {
enabled = false //Until I sort out testing on travis

View File

@ -26,7 +26,6 @@ plugins {
kotlin(PluginsDeps.multiplatform)
id(PluginsDeps.kapt)
id(PluginsDeps.androidApplication)
id(PluginsDeps.kotlinAndroidExtensions)
id(PluginsDeps.mavenPublish)
id(PluginsDeps.signing)
kotlin(PluginsDeps.kotlinSerializationPlugin) version Versions.kotlinSerializationPlugin

View File

@ -11,4 +11,5 @@ cd libsodium
./autogen.sh -s -f
./configure --prefix=$PREFIX "$@"
#./configure --prefix=$PREFIX "$@"
./configure

@ -1 +1 @@
Subproject commit d69a2342bccb98a3c28c0b7d5e4e6f3b8c789621
Subproject commit 0c5ac65576f67c41cb72802d46d5f12394ea48d6