Skip to content

Commit

Permalink
Kotlin 1.8.10 + maintenance (#37)
Browse files Browse the repository at this point in the history
* Update libsodium submodule, bump kotlin versions, switch to github actions
  • Loading branch information
ionspin authored Mar 26, 2023
1 parent f268886 commit 1cfa03a
Show file tree
Hide file tree
Showing 9 changed files with 87 additions and 10 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/github-main-snapshot.yml
Original file line number Diff line number Diff line change
@@ -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"
34 changes: 34 additions & 0 deletions .github/workflows/github-pull-request-build.yml
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
8 changes: 4 additions & 4 deletions buildSrc/src/main/kotlin/Deps.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions kotlin-js-store/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion multiplatform-crypto-api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion sodiumWrapper/configureMacos64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ cd libsodium

./autogen.sh -s -f

./configure --prefix=$PREFIX "$@"
#./configure --prefix=$PREFIX "$@"
./configure
2 changes: 1 addition & 1 deletion sodiumWrapper/libsodium
Submodule libsodium updated 44 files
+62 −6 .github/workflows/ci.yml
+3 −3 .github/workflows/codeql-analysis.yml
+162 −152 .github/workflows/dotnet-core.yml
+1 −2 AUTHORS
+1 −1 LICENSE
+5 −18 azure-pipelines.yml
+26 −9 build-aux/config.sub
+158 −14 build.zig
+2 −2 builds/msvc/properties/DebugLIB.props
+2 −2 builds/msvc/properties/Release.props
+350 −49 configure
+22 −7 configure.ac
+144 −0 dist-build/android-aar.sh
+1 −1 dist-build/android-armv7-a.sh
+1 −1 dist-build/android-armv8-a.sh
+27 −33 dist-build/android-build.sh
+121 −90 dist-build/apple-xcframework.sh
+25 −25 dist-build/emscripten-symbols.def
+54 −53 dist-build/emscripten.sh
+5 −3 dist-build/generate-emscripten-symbols.sh
+3 −3 dist-build/wasm32-wasi.sh
+2 −0 m4/ax_check_catchable_segv.m4
+4 −2 packaging/dotnet-core/libsodium.pkgproj
+1 −1 packaging/nuget/package.config
+904 −833 src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c
+5 −0 src/libsodium/crypto_pwhash/argon2/argon2.c
+5 −0 src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c
+3 −1 src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c
+29 −27 src/libsodium/crypto_scalarmult/curve25519/sandy2x/curve25519_sandy2x.c
+51 −51 src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe_frombytes_sandy2x.c
+1 −1 src/libsodium/crypto_stream/salsa20/xmm6int/u0.h
+5 −3 src/libsodium/sodium/utils.c
+1 −0 test/default/Makefile.am
+1 −0 test/default/Makefile.in
+70 −0 test/default/aead_aes256gcm.c
+12 −5 test/default/cmptest.h
+18 −15 test/default/misuse.c
+18 −4 test/default/pwhash_argon2i.c
+18 −4 test/default/pwhash_argon2id.c
+9 −0 test/default/run.sh
+3 −3 test/default/sodium_core.c
+4 −1 test/default/sodium_utils2.c
+4 −1 test/default/sodium_utils3.c
+58 −28 test/default/wasi-test-wrapper.sh

0 comments on commit 1cfa03a

Please sign in to comment.