diff --git a/CHANGELOG.md b/CHANGELOG.md index d36c071..7d264ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Changelog ========= +## Version 1.0.5 + +_2021-12-24_ + +* Update to Kotlin 1.6.10. + ## Version 1.0.4 _2021-09-25_ diff --git a/README.md b/README.md index c56c951..7aea8c3 100644 --- a/README.md +++ b/README.md @@ -28,11 +28,11 @@ Then add the following dependencies in your app `build.gradle` or `build.gradle. **Groovy** ```groovy -implementation "com.infinum.localian:localian:1.0.4" +implementation "com.infinum.localian:localian:1.0.5" ``` **KotlinDSL** ```kotlin -implementation("com.infinum.localian:localian:1.0.4") +implementation("com.infinum.localian:localian:1.0.5") ``` ## Setup diff --git a/config.gradle b/config.gradle index aa5bea7..419d523 100644 --- a/config.gradle +++ b/config.gradle @@ -7,7 +7,7 @@ ext { ] releaseConfig = [ "group" : "com.infinum.localian", - "version" : "1.0.4", - "versionCode": 1 * 100 * 100 + 0 * 100 + 4 + "version" : "1.0.5", + "versionCode": 1 * 100 * 100 + 0 * 100 + 5 ] } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index af305ee..a79b287 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,15 +1,16 @@ [versions] -localian = "1.0.4" -gradle = "7.0.2" -kotlin = "1.5.31" -appcompat = "1.3.1" -annotation = "1.2.0" +localian = "1.0.5" +gradle = "7.0.4" +kotlin = "1.6.10" +appcompat = "1.4.0" +annotation = "1.3.0" startup = "1.1.0" preference = "1.1.1" detekt = "1.18.0" -ktlint = "10.1.0" -cpd = "3.1" -dokka = "1.5.0" +ktlintplugin = "10.2.0" +ktlint = "0.43.1" +cpd = "3.2" +dokka = "1.6.0" junit = "4.13.2" mockk = "1.12.0" json = "20210307" @@ -30,7 +31,7 @@ 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 = "ktlint" } +ktlint = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "ktlintplugin" } cpd = { module = "de.aaschmid:gradle-cpd-plugin", version.ref = "cpd" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f7a1746..fa4d535 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip diff --git a/ktlint.gradle b/ktlint.gradle index 197e683..9424250 100644 --- a/ktlint.gradle +++ b/ktlint.gradle @@ -1,7 +1,7 @@ apply plugin: "org.jlleitschuh.gradle.ktlint" ktlint { - version = "0.42.1" + version = libs.versions.ktlint.get() debug = false android = true } \ No newline at end of file diff --git a/localian/build.gradle b/localian/build.gradle index 226ab39..e88d235 100644 --- a/localian/build.gradle +++ b/localian/build.gradle @@ -3,8 +3,6 @@ plugins { id "kotlin-android" } -apply from: 'jacoco.gradle' - android { buildFeatures { buildConfig = false diff --git a/localian/jacoco.gradle b/localian/jacoco.gradle deleted file mode 100644 index ceaf69c..0000000 --- a/localian/jacoco.gradle +++ /dev/null @@ -1,80 +0,0 @@ -apply plugin: 'jacoco' - -android { - testOptions { - unitTests.all { - jacoco { - includeNoLocationClasses = true - } - } - } -} - -jacoco { - toolVersion = "0.8.5" - reportsDir = file("$buildDir/reports/jacoco") -} - -task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'createDebugCoverageReport']) { - group = "Reporting" - description = "Generate Jacoco coverage reports for both unit and instrumented unit tests" - - reports { - csv.enabled false - xml.enabled = true - html.enabled = true - - xml.setDestination(file("${jacoco.reportsDir}/jacocoTestReport.xml")) - html.setDestination(file("${jacoco.reportsDir}/html")) - } - - def includesFilter = [ - '**/*Mapper*.*', - '**/*Presenter*.*', - '**/*ViewModel*.*' - ] - - def excludesFilter = [ - '**/*Test*.*', - '**/AutoValue_*.*', - '**/*JavascriptBridge.class', - '**/R.class', - '**/R$*.class', - '**/Manifest*.*', - 'android/**/*.*', - '**/BuildConfig.*', - '**/*$ViewBinder*.*', - '**/*$ViewInjector*.*', - '**/Lambda$*.class', - '**/Lambda.class', - '**/*Lambda.class', - '**/*Lambda*.class', - '**/lambda$*.class', - '**/lambda.class', - '**/*lambda.class', - '**/*lambda*.class', - '**/*$$special$$inlined$inject$*.*', - '**/*$InjectAdapter.class', - '**/*$ModuleAdapter.class', - '**/*$ViewInjector*.class', - '**/*_MembersInjector.class', //Dagger2 generated code - '*/*_MembersInjector*.*', //Dagger2 generated code - '**/*_*Factory*.*', //Dagger2 generated code - '*/*Component*.*', //Dagger2 generated code - '**/*Module*.*' //Dagger2 generated code - ] - - //can be other build type and flavor for test coverage - def debugTree = fileTree( - dir: "${buildDir}/intermediates/classes/debug", excludes: excludesFilter) + fileTree( - dir: "${buildDir}/tmp/kotlin-classes/debug", excludes: excludesFilter) // , includes: includesFilter - - getSourceDirectories().setFrom(files(["${project.projectDir}/src/main/kotlin"])) - getClassDirectories().setFrom(files([debugTree])) - getExecutionData().setFrom( - fileTree(dir: "$buildDir", includes: [ - "jacoco/testDebugUnitTest.exec", - "outputs/code_coverage/debugAndroidTest/connected/*coverage.ec" - ]) - ) -} \ No newline at end of file