kotlin 1.9.20

kosi-libs · Nov 17, 2023 · e635aed · e635aed
1 parent 53a88e6
commit e635aed
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 25 deletions.
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -19,10 +19,7 @@ env:
 
 jobs:
   build-upload:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macOS-latest, windows-latest]
+    runs-on: macOS-latest
     steps:
       - name: Checkout
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 #v3
@@ -39,29 +36,16 @@ jobs:
         with:
           java-version: 17
           distribution: 'temurin'
-      # Host only for MacOS / Windows
-      - name: Check (macos / windows)
-        if: matrix.os != 'ubuntu-latest'
-        run: ./gradlew hostOnlyTest
+      - name: Check
+        run: ./gradlew check
         shell: bash
       - name: Check Android
-        if: matrix.os == 'macOS-latest'
         uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b #v2.28.0
         with:
           api-level: 29
           ndk: 21.3.6528147
           cmake: 3.10.2.4988404
           script: ./gradlew connectedCheck
-      - name: Upload (macos / windows)
-        if: matrix.os != 'ubuntu-latest'
-        run: ./gradlew hostOnlyPublish -PgitRef=${{ github.ref }} -Psnapshot=true
-        shell: bash
-      # Linux / JVM / JS
-      - name: Check (ubuntu)
-        if: matrix.os == 'ubuntu-latest'
-        run: ./gradlew check
-        shell: bash
-      - name: Upload (ubuntu)
-        if: matrix.os == 'ubuntu-latest'
+      - name: Upload
         run: ./gradlew publishAllPublicationsToOssrhStagingRepository -PgitRef=${{ github.ref }} -Psnapshot=true
-        shell: bash
+        shell: bash
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,5 +4,5 @@ plugins {
 
 allprojects {
     group = "org.kodein.type"
-    version = "2.7.0"
+    version = "2.8.0"
 }
diff --git a/gradle.properties b/gradle.properties
@@ -2,3 +2,5 @@ org.gradle.jvmargs = -Xmx4g -XX:MaxMetaspaceSize=2g
 org.gradle.parallel = true
 
 android.useAndroidX = true
+
+org.kodein.native.enableCrossCompilation=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kaverit/build.gradle.kts b/kaverit/build.gradle.kts
@@ -13,7 +13,8 @@ kotlin.sourceSets {
     val nonJvmMain = create("nonJvmMain") { dependsOn(commonMain.get()) }
     getByName("nativeMain").dependsOn(nonJvmMain)
     getByName("jsBasedMain").dependsOn(nonJvmMain)
-    getByName("androidMain").dependsOn(getByName("jvmMain"))
+    getByName("jvmMain").dependsOn(getByName("jvmBasedMain"))
+    getByName("androidMain").dependsOn(getByName("jvmBasedMain"))
 }
 
 android {

diff --git a/...n/org/kodein/type/GenericArrayTypeImpl.kt → ...n/org/kodein/type/GenericArrayTypeImpl.kt b/...n/org/kodein/type/GenericArrayTypeImpl.kt → ...n/org/kodein/type/GenericArrayTypeImpl.kt
diff --git a/...n/org/kodein/type/JVMAbstractTypeToken.kt → ...n/org/kodein/type/JVMAbstractTypeToken.kt b/...n/org/kodein/type/JVMAbstractTypeToken.kt → ...n/org/kodein/type/JVMAbstractTypeToken.kt
diff --git a/...tlin/org/kodein/type/JVMClassTypeToken.kt → ...tlin/org/kodein/type/JVMClassTypeToken.kt b/...tlin/org/kodein/type/JVMClassTypeToken.kt → ...tlin/org/kodein/type/JVMClassTypeToken.kt
diff --git a/...g/kodein/type/JVMGenericArrayTypeToken.kt → ...g/kodein/type/JVMGenericArrayTypeToken.kt b/...g/kodein/type/JVMGenericArrayTypeToken.kt → ...g/kodein/type/JVMGenericArrayTypeToken.kt
diff --git a/.../kodein/type/JVMParameterizedTypeToken.kt → .../kodein/type/JVMParameterizedTypeToken.kt b/.../kodein/type/JVMParameterizedTypeToken.kt → .../kodein/type/JVMParameterizedTypeToken.kt
diff --git a/...vmMain/kotlin/org/kodein/type/JVMUtils.kt → ...edMain/kotlin/org/kodein/type/JVMUtils.kt b/...vmMain/kotlin/org/kodein/type/JVMUtils.kt → ...edMain/kotlin/org/kodein/type/JVMUtils.kt
diff --git a/.../org/kodein/type/ParameterizedTypeImpl.kt → .../org/kodein/type/ParameterizedTypeImpl.kt b/.../org/kodein/type/ParameterizedTypeImpl.kt → .../org/kodein/type/ParameterizedTypeImpl.kt
diff --git a/...jvmMain/kotlin/org/kodein/type/dispJVM.kt → ...sedMain/kotlin/org/kodein/type/dispJVM.kt b/...jvmMain/kotlin/org/kodein/type/dispJVM.kt → ...sedMain/kotlin/org/kodein/type/dispJVM.kt
diff --git a/...n/kotlin/org/kodein/type/typeTokensJVM.kt → ...n/kotlin/org/kodein/type/typeTokensJVM.kt b/...n/kotlin/org/kodein/type/typeTokensJVM.kt → ...n/kotlin/org/kodein/type/typeTokensJVM.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -4,7 +4,7 @@ buildscript {
         maven(url = "https://raw.githubusercontent.com/kosi-libs/kodein-internal-gradle-plugin/mvn-repo")
     }
     dependencies {
-        classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:8.2.2")
+        classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:8.3.0")
     }
 }