From e635aed9aead2113d2091945ca9fdb8ba7aa95f2 Mon Sep 17 00:00:00 2001 From: Romain Boisselle Date: Fri, 10 Nov 2023 15:16:18 +0100 Subject: [PATCH] kotlin 1.9.20 --- .github/workflows/snapshot.yml | 26 ++++--------------- build.gradle.kts | 2 +- gradle.properties | 2 ++ gradle/wrapper/gradle-wrapper.properties | 2 +- kaverit/build.gradle.kts | 3 ++- .../org/kodein/type/GenericArrayTypeImpl.kt | 0 .../org/kodein/type/JVMAbstractTypeToken.kt | 0 .../org/kodein/type/JVMClassTypeToken.kt | 0 .../kodein/type/JVMGenericArrayTypeToken.kt | 0 .../kodein/type/JVMParameterizedTypeToken.kt | 0 .../kotlin/org/kodein/type/JVMUtils.kt | 0 .../org/kodein/type/ParameterizedTypeImpl.kt | 0 .../kotlin/org/kodein/type/dispJVM.kt | 0 .../kotlin/org/kodein/type/typeTokensJVM.kt | 0 settings.gradle.kts | 2 +- 15 files changed, 12 insertions(+), 25 deletions(-) rename kaverit/src/{jvmMain => jvmBasedMain}/kotlin/org/kodein/type/GenericArrayTypeImpl.kt (100%) rename kaverit/src/{jvmMain => jvmBasedMain}/kotlin/org/kodein/type/JVMAbstractTypeToken.kt (100%) rename kaverit/src/{jvmMain => jvmBasedMain}/kotlin/org/kodein/type/JVMClassTypeToken.kt (100%) rename kaverit/src/{jvmMain => jvmBasedMain}/kotlin/org/kodein/type/JVMGenericArrayTypeToken.kt (100%) rename kaverit/src/{jvmMain => jvmBasedMain}/kotlin/org/kodein/type/JVMParameterizedTypeToken.kt (100%) rename kaverit/src/{jvmMain => jvmBasedMain}/kotlin/org/kodein/type/JVMUtils.kt (100%) rename kaverit/src/{jvmMain => jvmBasedMain}/kotlin/org/kodein/type/ParameterizedTypeImpl.kt (100%) rename kaverit/src/{jvmMain => jvmBasedMain}/kotlin/org/kodein/type/dispJVM.kt (100%) rename kaverit/src/{jvmMain => jvmBasedMain}/kotlin/org/kodein/type/typeTokensJVM.kt (100%) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 6d6b9e0..c09ea61 100644 --- 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 \ No newline at end of file + shell: bash diff --git a/build.gradle.kts b/build.gradle.kts index d8a9c8a..ec29d86 100644 --- 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 index 6643240..3323c21 100644 --- 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 index 27313fb..fce403e 100644 --- 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 index a1190e4..42d8c72 100644 --- 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/kaverit/src/jvmMain/kotlin/org/kodein/type/GenericArrayTypeImpl.kt b/kaverit/src/jvmBasedMain/kotlin/org/kodein/type/GenericArrayTypeImpl.kt similarity index 100% rename from kaverit/src/jvmMain/kotlin/org/kodein/type/GenericArrayTypeImpl.kt rename to kaverit/src/jvmBasedMain/kotlin/org/kodein/type/GenericArrayTypeImpl.kt diff --git a/kaverit/src/jvmMain/kotlin/org/kodein/type/JVMAbstractTypeToken.kt b/kaverit/src/jvmBasedMain/kotlin/org/kodein/type/JVMAbstractTypeToken.kt similarity index 100% rename from kaverit/src/jvmMain/kotlin/org/kodein/type/JVMAbstractTypeToken.kt rename to kaverit/src/jvmBasedMain/kotlin/org/kodein/type/JVMAbstractTypeToken.kt diff --git a/kaverit/src/jvmMain/kotlin/org/kodein/type/JVMClassTypeToken.kt b/kaverit/src/jvmBasedMain/kotlin/org/kodein/type/JVMClassTypeToken.kt similarity index 100% rename from kaverit/src/jvmMain/kotlin/org/kodein/type/JVMClassTypeToken.kt rename to kaverit/src/jvmBasedMain/kotlin/org/kodein/type/JVMClassTypeToken.kt diff --git a/kaverit/src/jvmMain/kotlin/org/kodein/type/JVMGenericArrayTypeToken.kt b/kaverit/src/jvmBasedMain/kotlin/org/kodein/type/JVMGenericArrayTypeToken.kt similarity index 100% rename from kaverit/src/jvmMain/kotlin/org/kodein/type/JVMGenericArrayTypeToken.kt rename to kaverit/src/jvmBasedMain/kotlin/org/kodein/type/JVMGenericArrayTypeToken.kt diff --git a/kaverit/src/jvmMain/kotlin/org/kodein/type/JVMParameterizedTypeToken.kt b/kaverit/src/jvmBasedMain/kotlin/org/kodein/type/JVMParameterizedTypeToken.kt similarity index 100% rename from kaverit/src/jvmMain/kotlin/org/kodein/type/JVMParameterizedTypeToken.kt rename to kaverit/src/jvmBasedMain/kotlin/org/kodein/type/JVMParameterizedTypeToken.kt diff --git a/kaverit/src/jvmMain/kotlin/org/kodein/type/JVMUtils.kt b/kaverit/src/jvmBasedMain/kotlin/org/kodein/type/JVMUtils.kt similarity index 100% rename from kaverit/src/jvmMain/kotlin/org/kodein/type/JVMUtils.kt rename to kaverit/src/jvmBasedMain/kotlin/org/kodein/type/JVMUtils.kt diff --git a/kaverit/src/jvmMain/kotlin/org/kodein/type/ParameterizedTypeImpl.kt b/kaverit/src/jvmBasedMain/kotlin/org/kodein/type/ParameterizedTypeImpl.kt similarity index 100% rename from kaverit/src/jvmMain/kotlin/org/kodein/type/ParameterizedTypeImpl.kt rename to kaverit/src/jvmBasedMain/kotlin/org/kodein/type/ParameterizedTypeImpl.kt diff --git a/kaverit/src/jvmMain/kotlin/org/kodein/type/dispJVM.kt b/kaverit/src/jvmBasedMain/kotlin/org/kodein/type/dispJVM.kt similarity index 100% rename from kaverit/src/jvmMain/kotlin/org/kodein/type/dispJVM.kt rename to kaverit/src/jvmBasedMain/kotlin/org/kodein/type/dispJVM.kt diff --git a/kaverit/src/jvmMain/kotlin/org/kodein/type/typeTokensJVM.kt b/kaverit/src/jvmBasedMain/kotlin/org/kodein/type/typeTokensJVM.kt similarity index 100% rename from kaverit/src/jvmMain/kotlin/org/kodein/type/typeTokensJVM.kt rename to kaverit/src/jvmBasedMain/kotlin/org/kodein/type/typeTokensJVM.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index 8f6989b..2d640d8 100644 --- 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") } }