From 3e2fdc20734dd4db6aec0424e50a3b01cf943163 Mon Sep 17 00:00:00 2001 From: tkadziolka Date: Tue, 27 Feb 2024 07:32:33 +0100 Subject: [PATCH 1/2] Upgraded kotlin to 1.9.22 and other dependencies --- README.md | 4 ++-- androidExample/build.gradle.kts | 2 +- build.gradle.kts | 1 + gradle/libs.versions.toml | 10 +++++----- kodeview/build.gradle.kts | 4 ++-- publish-root.gradle | 2 +- settings.gradle.kts | 4 ++-- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 3905a97..69b762d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ![kodeview_banner_opaque](https://github.com/SnipMeDev/KodeView/assets/8405055/59c6a2af-1b32-4a02-998f-ecae2296363a) [![Maven Central](https://img.shields.io/maven-central/v/dev.snipme/kodeview)](https://mvnrepository.com/artifact/dev.snipme) -[![Kotlin](https://img.shields.io/badge/kotlin-1.9.21-blue.svg?logo=kotlin)](http://kotlinlang.org) +[![Kotlin](https://img.shields.io/badge/kotlin-1.9.22-blue.svg?logo=kotlin)](http://kotlinlang.org) [![GitHub License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) # KodeView @@ -21,7 +21,7 @@ repositories { ``` ```shell -implementation("dev.snipme:kodeview:0.8.0") +implementation("dev.snipme:kodeview:0.9.0") ``` ## Features ✨ diff --git a/androidExample/build.gradle.kts b/androidExample/build.gradle.kts index 0703ce4..986c5e4 100644 --- a/androidExample/build.gradle.kts +++ b/androidExample/build.gradle.kts @@ -11,7 +11,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 25 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/build.gradle.kts b/build.gradle.kts index a71dfcc..38a7d4a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,4 +10,5 @@ plugins { id("io.github.gradle-nexus.publish-plugin") version "1.3.0" } +// TODO Debug this apply(from = "publish-root.gradle") \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 603a52d..802d8f1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,15 +1,15 @@ [versions] jvmTarget = "1.8" gradlePlugin = "8.1.0" -kotlin = "1.9.21" +kotlin = "1.9.22" ksp = "1.8.10-1.0.9" kotlinCompilerExtensionVersion = "1.5.3" -kotlinAndroid = "1.9.21" -kotlinMultiplatform = "1.9.21" -compose = "1.5.11" +kotlinAndroid = "1.9.22" +kotlinMultiplatform = "1.9.22" +compose = "1.5.12" androidLibrary = "8.1.1" kodeview = "0.8.0" -highlights = "0.7.1" +highlights = "0.8.0" composeMaterial = "1.2.1" [libraries] diff --git a/kodeview/build.gradle.kts b/kodeview/build.gradle.kts index de9c839..c7b5867 100644 --- a/kodeview/build.gradle.kts +++ b/kodeview/build.gradle.kts @@ -8,14 +8,14 @@ plugins { } group = "dev.snipme" -version = "0.8.0" +version = "0.9.0" android { namespace = "dev.snipme.kodeview" compileSdk = 34 defaultConfig { - minSdk = 21 + minSdk = 25 } } dependencies { diff --git a/publish-root.gradle b/publish-root.gradle index ecbba45..768f503 100644 --- a/publish-root.gradle +++ b/publish-root.gradle @@ -8,7 +8,7 @@ ext["sonatypeStagingProfileId"] = '' // Read local.properties file first if it exists Properties p = new Properties() -new FileInputStream("local.properties").withCloseable { is -> p.load(is) } +p.load(new FileInputStream("local.properties")) p.each { name, value -> ext[name] = value } // Set up Sonatype repository diff --git a/settings.gradle.kts b/settings.gradle.kts index 0be0bfa..28a1393 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -10,9 +10,9 @@ pluginManagement { } plugins { - val kotlinVersion = "1.9.21" + val kotlinVersion = "1.9.22" val agpVersion = "8.1.1" - val composeVersion = "1.5.11" + val composeVersion = "1.5.12" kotlin("jvm").version(kotlinVersion) kotlin("multiplatform").version(kotlinVersion) From c96796b5fc826f25f90345f9af399f1ba2c0492d Mon Sep 17 00:00:00 2001 From: tkadziolka Date: Tue, 27 Feb 2024 07:37:36 +0100 Subject: [PATCH 2/2] Cleaned code --- build.gradle.kts | 1 - publish-root.gradle | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 38a7d4a..a71dfcc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,5 +10,4 @@ plugins { id("io.github.gradle-nexus.publish-plugin") version "1.3.0" } -// TODO Debug this apply(from = "publish-root.gradle") \ No newline at end of file diff --git a/publish-root.gradle b/publish-root.gradle index 768f503..ecbba45 100644 --- a/publish-root.gradle +++ b/publish-root.gradle @@ -8,7 +8,7 @@ ext["sonatypeStagingProfileId"] = '' // Read local.properties file first if it exists Properties p = new Properties() -p.load(new FileInputStream("local.properties")) +new FileInputStream("local.properties").withCloseable { is -> p.load(is) } p.each { name, value -> ext[name] = value } // Set up Sonatype repository