From d6a2990fa6ccd76770da9a3e0b5858528d0875a6 Mon Sep 17 00:00:00 2001 From: Andrew Reed Date: Tue, 10 Sep 2024 17:34:07 +0100 Subject: [PATCH] Downgrade kotlin (#14) * Downgrade kotlin * Scripts to use xcode 15.1 * Removed experimental flag --- .github/workflows/pull-request.yml | 3 +++ .github/workflows/release.yml | 3 +++ library/build.gradle.kts | 4 ---- library/gradle.properties | 2 +- settings.gradle.kts | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 82df603..b79979d 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -9,6 +9,9 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v2 + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '15.1' - uses: actions/setup-java@v1 with: java-version: 17 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9467561..64344d3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,6 +9,9 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v2 + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '15.1' - uses: actions/setup-java@v1 with: java-version: 17 diff --git a/library/build.gradle.kts b/library/build.gradle.kts index eb1f656..351d8b5 100644 --- a/library/build.gradle.kts +++ b/library/build.gradle.kts @@ -108,10 +108,6 @@ kotlin { val iosTest by getting val iosSimulatorArm64Test by getting iosSimulatorArm64Test.dependsOn(iosTest) - - all { - languageSettings.optIn("kotlinx.cinterop.ExperimentalForeignApi") - } } } diff --git a/library/gradle.properties b/library/gradle.properties index 4cf6d2d..60427a2 100644 --- a/library/gradle.properties +++ b/library/gradle.properties @@ -2,7 +2,7 @@ signing.keyId="" signing.password="" MODULE_PACKAGE_NAME=com.myunidays -MODULE_VERSION_NUMBER=0.3.3 +MODULE_VERSION_NUMBER=0.3.4 MODULE_NAME=segmenkt OPEN_SOURCE_REPO=https://oss.sonatype.org/service/local/staging/deploy/maven2/ diff --git a/settings.gradle.kts b/settings.gradle.kts index 37b5657..b8b3249 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,7 +2,7 @@ import java.util.Properties dependencyResolutionManagement { versionCatalogs { - val kotlinVersion = "1.9.23" + val kotlinVersion = "1.9.10" create("libs") { version("kotlin", kotlinVersion)