From 9717ada0bd873317b4f3072cef948ec69b96b17c Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 12 Oct 2022 09:07:34 +0200 Subject: [PATCH 1/5] Update Kotlin to 1.7.20 See https://kotlinlang.org/docs/whatsnew1720.html --- CHANGELOG.md | 1 + build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41aa41a..825eac1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Dependency update: - [Android Gradle Plugin 7.2.2](https://developer.android.com/studio/releases/gradle-plugin#7-2-0) - [Gradle-7.5.1](https://docs.gradle.org/7.5.1/release-notes.html) + - [Kotlin-1.7.20](https://kotlinlang.org/docs/whatsnew1720.html) ### Removed - Stop building frameworks, they aren't published by default diff --git a/build.gradle.kts b/build.gradle.kts index 2203422..8d5408d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.7.10" + kotlin("jvm") version "1.7.20" id("com.android.library") version "7.2.2" apply false id("com.diffplug.spotless") version "6.9.0" id("com.github.ben-manes.versions") version "0.42.0" From f4e7e6bc90252a369372240a2ad2941717100ea1 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 12 Oct 2022 09:14:12 +0200 Subject: [PATCH 2/5] IDEA: Use Java 17 in project by default --- .idea/compiler.xml | 2 +- .idea/runConfigurations/build.xml | 9 ++++++++- .idea/runConfigurations/dependencyUpdates.xml | 9 ++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 1ebcc3c..b9890ec 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,7 +1,7 @@ - + diff --git a/.idea/runConfigurations/build.xml b/.idea/runConfigurations/build.xml index 125a74e..725e4c4 100644 --- a/.idea/runConfigurations/build.xml +++ b/.idea/runConfigurations/build.xml @@ -1,6 +1,11 @@ + - true + true + true + false \ No newline at end of file diff --git a/.idea/runConfigurations/dependencyUpdates.xml b/.idea/runConfigurations/dependencyUpdates.xml index ce2d0de..c5b100f 100644 --- a/.idea/runConfigurations/dependencyUpdates.xml +++ b/.idea/runConfigurations/dependencyUpdates.xml @@ -1,6 +1,11 @@ + - true + true + true + false \ No newline at end of file From 6924d4a0a76a82d6f816ede89a08c750b28fd853 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 12 Oct 2022 09:23:16 +0200 Subject: [PATCH 3/5] Android: Target API level 33 And use AGP 7.3.0, see changelog. --- CHANGELOG.md | 7 ++++--- build.gradle.kts | 2 +- log4k-slf4j/build.gradle.kts | 4 ++-- log4k/build.gradle.kts | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 825eac1..8b16cb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Changed +- Android: Target API level 33 (Android 13) - Dependency update: - - [Android Gradle Plugin 7.2.2](https://developer.android.com/studio/releases/gradle-plugin#7-2-0) - - [Gradle-7.5.1](https://docs.gradle.org/7.5.1/release-notes.html) - - [Kotlin-1.7.20](https://kotlinlang.org/docs/whatsnew1720.html) + - [Android Gradle Plugin 7.3.0](https://developer.android.com/studio/releases/gradle-plugin#7-3-0) + - [Gradle 7.5.1](https://docs.gradle.org/7.5.1/release-notes.html) + - [Kotlin 1.7.20](https://kotlinlang.org/docs/whatsnew1720.html) ### Removed - Stop building frameworks, they aren't published by default diff --git a/build.gradle.kts b/build.gradle.kts index 8d5408d..88eb878 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ plugins { kotlin("jvm") version "1.7.20" - id("com.android.library") version "7.2.2" apply false + id("com.android.library") version "7.3.0" apply false id("com.diffplug.spotless") version "6.9.0" id("com.github.ben-manes.versions") version "0.42.0" } diff --git a/log4k-slf4j/build.gradle.kts b/log4k-slf4j/build.gradle.kts index f86e5c7..f462a11 100644 --- a/log4k-slf4j/build.gradle.kts +++ b/log4k-slf4j/build.gradle.kts @@ -47,11 +47,11 @@ kotlin { android { buildToolsVersion = "33.0.0" - compileSdk = 32 + compileSdk = 33 defaultConfig { minSdk = 17 - targetSdk = 32 + targetSdk = 33 } sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") diff --git a/log4k/build.gradle.kts b/log4k/build.gradle.kts index 0b9ebfd..20b67ce 100644 --- a/log4k/build.gradle.kts +++ b/log4k/build.gradle.kts @@ -38,11 +38,11 @@ kotlin { android { buildToolsVersion = "33.0.0" - compileSdk = 32 + compileSdk = 33 defaultConfig { minSdk = 17 - targetSdk = 32 + targetSdk = 33 } sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") From 183961a064045f9464e6e600d429237b14e45082 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 12 Oct 2022 09:25:58 +0200 Subject: [PATCH 4/5] Gradle: Update Spotless plugin to 6.11.0 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 88eb878..97b4dc2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("jvm") version "1.7.20" id("com.android.library") version "7.3.0" apply false - id("com.diffplug.spotless") version "6.9.0" + id("com.diffplug.spotless") version "6.11.0" id("com.github.ben-manes.versions") version "0.42.0" } From 92723a739df4d85432211252d4ecb4debe3527c1 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 12 Oct 2022 09:27:30 +0200 Subject: [PATCH 5/5] Release version 1.2.3 Signed-off-by: Sascha Peilicke --- CHANGELOG.md | 2 ++ README.md | 2 +- log4k-slf4j/build.gradle.kts | 2 +- log4k/build.gradle.kts | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b16cb6..019f320 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [1.2.3] - 2022-10-12 ### Changed - Android: Target API level 33 (Android 13) - Dependency update: diff --git a/README.md b/README.md index f13d626..9dbaeff 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ repositories { } dependencies { - implementation("de.peilicke.sascha:log4k:1.2.2") + implementation("de.peilicke.sascha:log4k:1.2.3") } ``` diff --git a/log4k-slf4j/build.gradle.kts b/log4k-slf4j/build.gradle.kts index f462a11..3196d6d 100644 --- a/log4k-slf4j/build.gradle.kts +++ b/log4k-slf4j/build.gradle.kts @@ -60,7 +60,7 @@ android { } group = "de.peilicke.sascha" -version = "1.2.2" +version = "1.2.3" val javadocJar by tasks.registering(Jar::class) { archiveClassifier.set("javadoc") diff --git a/log4k/build.gradle.kts b/log4k/build.gradle.kts index 20b67ce..c6c2611 100644 --- a/log4k/build.gradle.kts +++ b/log4k/build.gradle.kts @@ -51,7 +51,7 @@ android { } group = "de.peilicke.sascha" -version = "1.2.2" +version = "1.2.3" val javadocJar by tasks.registering(Jar::class) { archiveClassifier.set("javadoc")