diff --git a/.github/workflows/code-analysis.yml b/.github/workflows/code-analysis.yml index 6f2d1b7..13e24d0 100644 --- a/.github/workflows/code-analysis.yml +++ b/.github/workflows/code-analysis.yml @@ -45,23 +45,6 @@ jobs: - name: Stop Gradle run: ./gradlew --stop - ktlint: - name: ktlint - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Save Gradle Caches - uses: actions/cache@v4 - with: - path: ~/.gradle/caches/ - key: gradle-caches-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - gradle-caches-${{ runner.os }}- - - name: ktlint - run: ./gradlew ktlintAll - - name: Stop Gradle - run: ./gradlew --stop cpd: name: CPD runs-on: ubuntu-latest diff --git a/CHANGELOG.md b/CHANGELOG.md index 435c0d6..865ad16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ Changelog ========= +## Version 2.0.0 + +_2026-03-02_ + +* Update minSdk to 23 +* Update to Kotlin 2.2.0. +* Update dependencies. + ## Version 1.1.0 _2023-04-07_ diff --git a/README.md b/README.md index 266f479..06d43da 100644 --- a/README.md +++ b/README.md @@ -29,11 +29,11 @@ Then add the following dependencies in your app `build.gradle` or `build.gradle. **Groovy** ```groovy -implementation "com.infinum.localian:localian:1.1.0" +implementation "com.infinum.localian:localian:2.0.0" ``` **KotlinDSL** ```kotlin -implementation("com.infinum.localian:localian:1.1.0") +implementation("com.infinum.localian:localian:2.0.0") ``` ## Setup diff --git a/build.gradle b/build.gradle index 22a15d9..8a06d37 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,6 @@ buildscript { classpath libs.kotlin.gradle classpath libs.cpd classpath libs.detekt.gradle - classpath libs.ktlint classpath libs.dokka } } @@ -29,7 +28,6 @@ allprojects { subprojects { apply from: "$rootDir/cpd.gradle" apply from: "$rootDir/detekt.gradle" - apply from: "$rootDir/ktlint.gradle" apply from: "$rootDir/dokka.gradle" } @@ -57,13 +55,6 @@ task detektAll(dependsOn: [ description = "Run Detekt on all modules" } -task ktlintAll(dependsOn: [ - ':localian:ktlintCheck' -]) { - group = "Verification" - description = "Run ktlint on all modules" -} - task cpdAll(dependsOn: [ ':localian:cpdCheck' ]) { @@ -74,7 +65,6 @@ task cpdAll(dependsOn: [ task runStaticChecks(dependsOn: [ ':lintAll', ':detektAll', - ':ktlintAll', ':cpdAll' ]) { group = "Verification" diff --git a/config.gradle b/config.gradle index 7033e87..e067df2 100644 --- a/config.gradle +++ b/config.gradle @@ -1,13 +1,13 @@ ext { - def major = 1 - def minor = 1 + def major = 2 + def minor = 0 def patch = 0 buildConfig = [ - "minSdk" : 21, - "compileSdk": 33, - "targetSdk" : 33, - "buildTools": "33.0.2" + "minSdk" : 23, + "compileSdk": 36, + "targetSdk" : 36, + "buildTools": "36.0.0" ] releaseConfig = [ "group" : "com.infinum.localian", diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5aa8676..667e70c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,20 +1,18 @@ [versions] -localian = "1.0.9" -gradle = "7.4.2" -kotlin = "1.8.10" -appcompat = "1.6.1" -viewmodel = "2.6.0" -annotation = "1.6.0" -startup = "1.1.1" -preference = "1.2.0" -detekt = "1.21.0" -ktlintplugin = "10.3.0" -ktlint = "0.45.2" -cpd = "3.3" -dokka = "1.8.10" +localian = "2.0.0" +gradle = "8.13.2" +kotlin = "2.2.0" +appcompat = "1.7.1" +viewmodel = "2.10.0" +annotation = "1.9.1" +startup = "1.2.0" +preference = "1.2.1" +detekt = "1.23.8" +cpd = "3.5" +dokka = "2.1.0" junit = "4.13.2" -mockk = "1.13.2" -json = "20220924" +mockk = "1.14.9" +json = "20251224" [libraries] library = { module = "com.infinum.localian:localian", version.ref = "localian" } @@ -33,8 +31,6 @@ androidx-preference = { module = "androidx.preference:preference-ktx", version.r detekt-gradle = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" } detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" } -ktlint = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "ktlintplugin" } - cpd = { module = "de.aaschmid:gradle-cpd-plugin", version.ref = "cpd" } dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 01a25a3..ba3ac87 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Apr 03 17:47:20 EEST 2020 +#Mon Mar 02 10:03:50 CET 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip diff --git a/ktlint.gradle b/ktlint.gradle deleted file mode 100644 index 9424250..0000000 --- a/ktlint.gradle +++ /dev/null @@ -1,7 +0,0 @@ -apply plugin: "org.jlleitschuh.gradle.ktlint" - -ktlint { - version = libs.versions.ktlint.get() - debug = false - android = true -} \ No newline at end of file