From 1cfa03a18f36e3537e2b2fa4aa54ebc7ebd2e898 Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Sun, 26 Mar 2023 19:12:15 +0200 Subject: [PATCH] Kotlin 1.8.10 + maintenance (#37) * Update libsodium submodule, bump kotlin versions, switch to github actions --- .github/workflows/github-main-snapshot.yml | 38 +++++++++++++++++++ .../workflows/github-pull-request-build.yml | 34 +++++++++++++++++ buildSrc/build.gradle.kts | 4 +- buildSrc/src/main/kotlin/Deps.kt | 8 ++-- kotlin-js-store/yarn.lock | 5 +++ multiplatform-crypto-api/build.gradle.kts | 2 +- sample/build.gradle.kts | 1 - sodiumWrapper/configureMacos64.sh | 3 +- sodiumWrapper/libsodium | 2 +- 9 files changed, 87 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/github-main-snapshot.yml create mode 100644 .github/workflows/github-pull-request-build.yml diff --git a/.github/workflows/github-main-snapshot.yml b/.github/workflows/github-main-snapshot.yml new file mode 100644 index 00000000..a11f21d3 --- /dev/null +++ b/.github/workflows/github-main-snapshot.yml @@ -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" \ No newline at end of file diff --git a/.github/workflows/github-pull-request-build.yml b/.github/workflows/github-pull-request-build.yml new file mode 100644 index 00000000..e316eb08 --- /dev/null +++ b/.github/workflows/github-pull-request-build.yml @@ -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" \ No newline at end of file diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 03b3d33f..50388b8d 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -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()) diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt index 2c60d7b3..88fc668a 100644 --- a/buildSrc/src/main/kotlin/Deps.kt +++ b/buildSrc/src/main/kotlin/Deps.kt @@ -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" diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index fdcb46f6..98718ab3 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -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" diff --git a/multiplatform-crypto-api/build.gradle.kts b/multiplatform-crypto-api/build.gradle.kts index f3be8bf7..8f149bfd 100644 --- a/multiplatform-crypto-api/build.gradle.kts +++ b/multiplatform-crypto-api/build.gradle.kts @@ -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 diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 7aae6fc9..50011968 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -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 diff --git a/sodiumWrapper/configureMacos64.sh b/sodiumWrapper/configureMacos64.sh index 1ae7f69e..49b38e66 100755 --- a/sodiumWrapper/configureMacos64.sh +++ b/sodiumWrapper/configureMacos64.sh @@ -11,4 +11,5 @@ cd libsodium ./autogen.sh -s -f -./configure --prefix=$PREFIX "$@" +#./configure --prefix=$PREFIX "$@" +./configure \ No newline at end of file diff --git a/sodiumWrapper/libsodium b/sodiumWrapper/libsodium index d69a2342..0c5ac655 160000 --- a/sodiumWrapper/libsodium +++ b/sodiumWrapper/libsodium @@ -1 +1 @@ -Subproject commit d69a2342bccb98a3c28c0b7d5e4e6f3b8c789621 +Subproject commit 0c5ac65576f67c41cb72802d46d5f12394ea48d6