From 9b994de85708b0811a27e522e59e98b36af4f2d4 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 28 Jul 2023 11:53:30 +0600 Subject: [PATCH 1/2] start 1.2.0 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71608be..f73fe9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 1.2.0 + ## 1.1.2 * `Kotlin`: `1.8.22` diff --git a/gradle.properties b/gradle.properties index 3ba0c06..956ef4c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,5 +10,5 @@ org.gradle.jvmargs=-Xmx512m # Project data group=dev.inmo -version=1.1.2 -android_code_version=21 +version=1.2.0 +android_code_version=22 From 01722311e6e1971df70b54af62f15cf115c9df1e Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 28 Jul 2023 12:13:27 +0600 Subject: [PATCH 2/2] update kotlin and add versions plugin --- CHANGELOG.md | 2 ++ build.gradle | 1 + defaultAndroidSettings.gradle | 4 ---- gradle/libs.versions.toml | 8 ++++++-- gradle/wrapper/gradle-wrapper.properties | 2 +- src/{main => androidMain}/AndroidManifest.xml | 0 src/{main => androidMain}/kotlin/ActualLogger.kt | 0 7 files changed, 10 insertions(+), 7 deletions(-) rename src/{main => androidMain}/AndroidManifest.xml (100%) rename src/{main => androidMain}/kotlin/ActualLogger.kt (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index f73fe9f..d4ebfb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 1.2.0 +* `Kotlin`: `1.9.0` + ## 1.1.2 * `Kotlin`: `1.8.22` diff --git a/build.gradle b/build.gradle index c3e70ea..0331ed9 100644 --- a/build.gradle +++ b/build.gradle @@ -19,6 +19,7 @@ buildscript { plugins { alias(libs.plugins.kotlin.multiplatform) alias(libs.plugins.kotlin.dokka) + alias(libs.plugins.versions) } apply plugin: "com.android.library" diff --git a/defaultAndroidSettings.gradle b/defaultAndroidSettings.gradle index 1902595..137fcb5 100644 --- a/defaultAndroidSettings.gradle +++ b/defaultAndroidSettings.gradle @@ -55,10 +55,6 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() - } - sourceSets { String sep = File.separator main.java.srcDirs += "src${sep}main${sep}kotlin" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e23fb65..e65a8c9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,10 @@ [versions] -kotlin = "1.8.22" +kotlin = "1.9.0" kotlin-gradle-plugin = "7.4.2" +versions = "0.47.0" + dokka = "1.8.20" dexcount = "4.0.0" @@ -12,7 +14,7 @@ espresso_core = "3.5.1" android-minSdk = "21" android-compileSdk = "33" -android-buildTools = "33.0.1" +android-buildTools = "33.0.2" github-release = "2.4.1" @@ -38,3 +40,5 @@ github-release = { module = "com.github.breadmoirai:github-release", version.ref kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } + +versions = { id = "com.github.ben-manes.versions", version.ref = "versions" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 774fae8..98debb8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/AndroidManifest.xml b/src/androidMain/AndroidManifest.xml similarity index 100% rename from src/main/AndroidManifest.xml rename to src/androidMain/AndroidManifest.xml diff --git a/src/main/kotlin/ActualLogger.kt b/src/androidMain/kotlin/ActualLogger.kt similarity index 100% rename from src/main/kotlin/ActualLogger.kt rename to src/androidMain/kotlin/ActualLogger.kt