Skip to content

Update kotlin to version 2.0.0 #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update kotlin to version 2.0.0 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
build/

node_modules/

.kotlin
2 changes: 1 addition & 1 deletion .idea/kotlinc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ android {
compileSdk = 31
defaultConfig {
minSdk = 21
//noinspection ExpiredTargetSdkVersion support for cap2
targetSdk = 31
}
buildTypes {
Expand Down
8 changes: 4 additions & 4 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand All @@ -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")
}
12 changes: 0 additions & 12 deletions core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
// }
}
}
}

Expand Down
1 change: 1 addition & 0 deletions cwac/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ android {
compileSdk = 31
defaultConfig {
minSdk = 21
//noinspection ExpiredTargetSdkVersion support for cap2
targetSdk = 31
}
buildTypes {
Expand Down
11 changes: 0 additions & 11 deletions kson/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
// }
}
}
}

Expand Down