Skip to content

Commit

Permalink
[dependency-update] Update gradle + dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
lailabecker committed May 13, 2024
1 parent 9eb5e37 commit ef57e67
Show file tree
Hide file tree
Showing 6 changed files with 230 additions and 151 deletions.
68 changes: 40 additions & 28 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,52 +39,64 @@ group = "ch.dreipol"
kotlin {
jvmToolchain(17)

ios("ios") {
iosX64() {
binaries {
framework()
}
}
iosSimulatorArm64("iosSimulatorArm64") {

iosArm64() {
binaries {
framework()
}
}
android("android") {
compilations.all {

iosSimulatorArm64() {
binaries {
framework()
}
}

androidTarget {
compilations.configureEach {
kotlinOptions {
jvmTarget = "11"
jvmTarget = 17
}
}
}

android() {
publishAllLibraryVariants()
}

sourceSets["commonMain"].dependencies {
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$versions_coroutines")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:$datetime_version")
api("org.reduxkotlin:redux-kotlin-threadsafe:$versions_redux_kotlin")
api("org.reduxkotlin:redux-kotlin-thunk:$versions_redux_kotlin_thunk")
api("co.touchlab:kermit:$versions_kermit")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$json_serialization_version")
}
sourceSets {
commonMain.dependencies {
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$versions_coroutines")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:$datetime_version")
api("org.reduxkotlin:redux-kotlin-threadsafe:$versions_redux_kotlin")
api("org.reduxkotlin:redux-kotlin-thunk:$versions_redux_kotlin_thunk")
api("co.touchlab:kermit:$versions_kermit")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$json_serialization_version")
}

sourceSets["commonTest"].dependencies {
implementation(kotlin('test'))
}
commonTest.dependencies {
implementation(kotlin('test'))
}

sourceSets["androidMain"].dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$versions_kotlin"
implementation("androidx.appcompat:appcompat:$versions_app_compat")
implementation("com.google.android.play:core:$versions_play_core")
implementation("com.google.android.play:core-ktx:$versions_play_core_ktx")
api("org.jetbrains.kotlinx:kotlinx-datetime:$datetime_version")
}
androidMain.dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$versions_kotlin"
implementation("androidx.appcompat:appcompat:$versions_app_compat")
implementation("com.google.android.play:review:2.0.3")
implementation("com.google.android.play:core-ktx:$versions_play_core_ktx")
api("org.jetbrains.kotlinx:kotlinx-datetime:$datetime_version")
}

sourceSets["iosMain"].dependencies {
api("co.touchlab:kermit-simple:$versions_kermit")
}
iosMain.dependencies {
api("co.touchlab:kermit-simple:$versions_kermit")
}

sourceSets["iosSimulatorArm64Main"].dependsOn(sourceSets["iosMain"])
iosSimulatorArm64Main.dependsOn(sourceSets["iosMain"])
}

// TODO: Remove as soon as Android Studio (Iguana) is fixed
task("testClasses")
Expand All @@ -93,7 +105,7 @@ kotlin {
android {
namespace "ch.dreipol.dreimultiplatform"

compileSdkVersion 33
compileSdk 34
defaultConfig {
minSdkVersion 23
}
Expand Down
11 changes: 5 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,19 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
systemProp.org.gradle.internal.publish.checksums.insecure=true
# -------dependency versions-------
# shared
versions_kotlin=1.9.23
versions_linter=12.1.0
versions_coroutines=1.7.3
versions_kotlin=1.9.24
versions_linter=12.1.1
versions_coroutines=1.8.0
datetime_version=0.5.0
json_serialization_version=1.6.2
json_serialization_version=1.6.3
versions_redux_kotlin=0.6.1
versions_redux_kotlin_thunk=0.6.0
# 2.0.2 vv
versions_kermit=2.0.3
versions_dokka=1.9.20
versions_nexus_publish=1.3.0
# android
# Update to gradle 8 is blocked by this error here: https://github.com/gradle-nexus/publish-plugin/issues/208
versions_android_gradle_plugin=7.4.2
versions_android_gradle_plugin=8.3.2
versions_app_compat=1.6.1
versions_play_core=1.10.3
versions_play_core_ktx=1.8.1
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
# Updating to gradle 8 is prevented by this error here: https://github.com/gradle-nexus/publish-plugin/issues/208
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit ef57e67

Please sign in to comment.