Skip to content

Commit

Permalink
Update Kotlin.
Browse files Browse the repository at this point in the history
Update Gradle wrapper.
Prepare for release.
  • Loading branch information
Bojan committed Dec 24, 2021
1 parent c7e5ba7 commit 822f74e
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 97 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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_
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions config.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
]
}
19 changes: 10 additions & 9 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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" }

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ktlint.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: "org.jlleitschuh.gradle.ktlint"

ktlint {
version = "0.42.1"
version = libs.versions.ktlint.get()
debug = false
android = true
}
2 changes: 0 additions & 2 deletions localian/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ plugins {
id "kotlin-android"
}

apply from: 'jacoco.gradle'

android {
buildFeatures {
buildConfig = false
Expand Down
80 changes: 0 additions & 80 deletions localian/jacoco.gradle

This file was deleted.

0 comments on commit 822f74e

Please sign in to comment.