diff --git a/.gitignore b/.gitignore index 9e095cb..fb956f1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ build/ node_modules/ + +.kotlin diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 148fdd2..6d0ee1c 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 0212856..37da513 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -19,6 +19,7 @@ android { compileSdk = 31 defaultConfig { minSdk = 21 + //noinspection ExpiredTargetSdkVersion support for cap2 targetSdk = 31 } buildTypes { diff --git a/build.gradle.kts b/build.gradle.kts index 11276a0..44e451c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - val kotlinVersion = "1.9.24" + val kotlinVersion = "2.0.0" classpath(kotlin("gradle-plugin", version = kotlinVersion)) classpath(kotlin("serialization", version = kotlinVersion)) @@ -21,9 +21,9 @@ allprojects { extra.apply { set("kotlinxCoroutinesCoreVersion", "1.8.1") - set("kotlinxSerializationJsonVersion", "1.6.3") - set("kotlinxAtomicfuVersion", "0.23.2") + set("kotlinxSerializationJsonVersion", "1.7.0-RC") + set("kotlinxAtomicfuVersion", "0.24.0") set("androidxAppcompatVersion", "1.6.1") set("mavenGroup", "com.github.SpryRocks.ionic-plugin-core") - set("mavenVersion", "0.1.18-alpha.0") + set("mavenVersion", "0.2.0-alpha.0") } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index a2166ad..31b410d 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -37,18 +37,6 @@ kotlin { implementation("org.jetbrains.kotlinx:atomicfu:$kotlinxAtomicfuVersion") } } - if (enableJS == "true") { -// jsMain { -// } - } -// val jvmMain by getting -// val nativeMain by creating { -// } - if (enableIos == "true") { -// val iosMain by getting { -// dependsOn(nativeMain) -// } - } } } diff --git a/cwac/build.gradle.kts b/cwac/build.gradle.kts index 2064312..81b80b1 100644 --- a/cwac/build.gradle.kts +++ b/cwac/build.gradle.kts @@ -17,6 +17,7 @@ android { compileSdk = 31 defaultConfig { minSdk = 21 + //noinspection ExpiredTargetSdkVersion support for cap2 targetSdk = 31 } buildTypes { diff --git a/kson/build.gradle.kts b/kson/build.gradle.kts index dad8b8f..3f5f9f6 100644 --- a/kson/build.gradle.kts +++ b/kson/build.gradle.kts @@ -40,17 +40,6 @@ kotlin { implementation(kotlin("test")) } } - if (enableJS == "true") { -// val jsMain by getting { -// } - } -// val jvmMain by getting -// val nativeMain by creating { -// } - if (enableIos == "true") { -// val iosMain by getting { -// } - } } }