Skip to content

Commit

Permalink
Update to Kotlin 1.9.10 and AGP 8.1.1 (#8)
Browse files Browse the repository at this point in the history
  • Loading branch information
marcantoinefortier authored Aug 31, 2023
1 parent f386d3b commit 8691353
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 16 deletions.
2 changes: 2 additions & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
java openjdk-17
ruby 3.2.1
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<img src="https://user-images.githubusercontent.com/5982196/205750835-4f657a00-1bca-4631-96d9-cc4acbfbd2eb.png" width="600" />
<p><br />A lightweight Kotlin Multiplatform library to monitor network state changes</p>
<a href="https://github.com/mirego/kmp-boilerplate/actions/workflows/ci.yml"><img src="https://github.com/mirego/kmp-boilerplate/actions/workflows/ci.yaml/badge.svg"/></a>
<a href="https://kotlinlang.org/"><img src="https://img.shields.io/badge/kotlin-1.8.20-blue.svg?logo=kotlin"/></a>
<a href="https://kotlinlang.org/"><img src="https://img.shields.io/badge/kotlin-1.9.10-blue.svg?logo=kotlin"/></a>
<a href="https://opensource.org/licenses/BSD-3-Clause"><img src="https://img.shields.io/badge/License-BSD_3--Clause-blue.svg"/></a>
</div>

Expand Down
7 changes: 4 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id("com.android.library") version "8.0.0" apply false
kotlin("android") version "1.8.20" apply false
kotlin("multiplatform") version "1.8.20" apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.kotlin.multiplatform) apply false
alias(libs.plugins.kotlin.native.cocoapods) apply false
}
20 changes: 20 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[versions]
androidGradlePlugin = "8.1.1"
androidxStartup = "1.1.1"
kotlin = "1.9.10"
kotlinxCoroutines = "1.7.3"

[libraries]
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }
androidx-startup-runtime = { module = "androidx.startup:startup-runtime", version.ref = "androidxStartup" }

[plugins]
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlin-native-cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }

[bundles]

6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Aug 25 14:41:38 EDT 2022
#Thu Aug 31 13:20:04 EDT 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
16 changes: 7 additions & 9 deletions konnectivity/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
@file:Suppress("UNUSED_VARIABLE", "UnstableApiUsage")

plugins {
kotlin("multiplatform")
kotlin("native.cocoapods")
id("com.android.library")
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.kotlin.native.cocoapods)
alias(libs.plugins.android.library)
id("maven-publish")
id("mirego.publish") version "1.0"
id("mirego.release") version "2.0"
Expand All @@ -12,7 +10,7 @@ group = "com.mirego"

kotlin {
jvmToolchain(17)
android {
androidTarget {
publishAllLibraryVariants()
}
ios()
Expand All @@ -30,7 +28,7 @@ kotlin {
sourceSets {
val commonMain by getting {
dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
implementation(libs.kotlinx.coroutines.core)
}
}
val commonTest by getting {
Expand All @@ -41,7 +39,7 @@ kotlin {

val androidMain by getting {
dependencies {
implementation("androidx.startup:startup-runtime:1.1.1")
implementation(libs.androidx.startup.runtime)
}
}
val androidUnitTest by getting
Expand Down Expand Up @@ -73,7 +71,7 @@ android {
namespace = "com.mirego.konnectivity"

defaultConfig {
compileSdk = 33
compileSdk = 34
minSdk = 21
}

Expand Down

0 comments on commit 8691353

Please sign in to comment.