Skip to content

Dependency updates #21

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

Merged
merged 2 commits into from
Mar 13, 2025
Merged

Dependency updates #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb7dbae
Dependency updates
kp-iva-nedeleva Mar 12, 2025
f0a37b9
Version update
kp-iva-nedeleva Mar 13, 2025
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
6 changes: 3 additions & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id("com.android.library").version("7.3.1").apply(false)
kotlin("multiplatform").version("1.9.20").apply(false)
kotlin("plugin.serialization").version("1.9.20").apply(false)
id("com.android.library").version("8.9.0").apply(false)
kotlin("multiplatform").version("2.1.0").apply(false)
kotlin("plugin.serialization").version("2.1.0").apply(false)
}

tasks.register("clean", Delete::class) {
Expand Down
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Wed Mar 12 12:23:32 EET 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
42 changes: 23 additions & 19 deletions regions/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFramework

plugins {
Expand All @@ -22,10 +23,9 @@ publishing {
android {
namespace = "com.kape.regions"

compileSdk = 34
compileSdk = 35
defaultConfig {
minSdk = 21
targetSdk = 34
}

buildTypes {
Expand All @@ -38,20 +38,20 @@ android {
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
kotlin {
group = "com.kape.android"
version = "1.7.0"
version = "1.7.1"

jvmToolchain(17)

// Enable the default target hierarchy.
// It's a template for all possible targets and their shared source sets hardcoded in the
// Kotlin Gradle plugin.
targetHierarchy.default()
applyDefaultHierarchyTemplate()

// Android
android {
androidTarget {
publishLibraryVariants("release")
compilations.all {
kotlinOptions {
jvmTarget = "17"
}
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}

Expand All @@ -78,37 +78,36 @@ kotlin {
sourceSets {
val commonMain by getting {
dependencies {
implementation("io.ktor:ktor-client-core:2.3.3")
implementation("io.ktor:ktor-client-core:3.1.1")
implementation("org.jetbrains.kotlin:kotlin-stdlib-common")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.5.1")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.0")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0")
}
}
val commonTest by getting {
dependencies {
implementation(kotlin("test"))
implementation(kotlin("test-junit"))
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
}
}
val androidMain by getting {
dependencies {
implementation("com.madgag.spongycastle:core:1.58.0.0")
implementation("io.ktor:ktor-client-okhttp:2.3.3")
implementation("io.ktor:ktor-client-okhttp:3.1.1")
implementation("org.jetbrains.kotlin:kotlin-stdlib")
}
}
val androidUnitTest by getting {
dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1")
}
}
val iosMain by getting {
dependencies {
implementation("io.ktor:ktor-client-darwin:2.3.3")
implementation("io.ktor:ktor-client-darwin:3.1.0")
}
}
val iosTest by getting {
Expand All @@ -117,8 +116,13 @@ kotlin {
}
val tvosMain by getting {
dependencies {
implementation("io.ktor:ktor-client-darwin:2.3.3")
implementation("io.ktor:ktor-client-darwin:3.1.0")
}
}
}
}

java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
Loading