Skip to content

Commit 361eb17

Browse files
committed
Upgrade deps and migrate kotlin 1.4.21
1 parent 4b21696 commit 361eb17

File tree

8 files changed

+10
-15
lines changed

8 files changed

+10
-15
lines changed

app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: "com.android.application"
22
apply plugin: "kotlin-android"
3-
apply plugin: "kotlin-android-extensions"
43

54
android {
65
compileSdkVersion androidCompileSdkVersion

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.0'
9+
classpath 'com.android.tools.build:gradle:4.1.1'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
11-
classpath "com.diffplug.spotless:spotless-plugin-gradle:5.8.0"
11+
classpath "com.diffplug.spotless:spotless-plugin-gradle:5.8.2"
1212
classpath "de.mannodermaus.gradle.plugins:android-junit5:1.6.2.0"
1313
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5"
14-
classpath("com.github.ben-manes:gradle-versions-plugin:0.35.0")
14+
classpath "com.github.ben-manes:gradle-versions-plugin:0.36.0"
1515
}
1616
}
1717
apply {

dependencies.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ext {
99
androidTargetSdkVersion = 29
1010

1111
// KOTLIN
12-
kotlinVersion = "1.4.10"
12+
kotlinVersion = "1.4.21"
1313
kotlinStdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
1414
kotlinReflect = "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
1515

@@ -22,12 +22,12 @@ ext {
2222

2323
//rx
2424
rxjava2Version = "2.2.20"
25-
rxjava3Version = "3.0.7"
25+
rxjava3Version = "3.0.8"
2626
rxjava2 = "io.reactivex.rxjava2:rxjava:$rxjava2Version"
2727
rxjava3 = "io.reactivex.rxjava3:rxjava:$rxjava3Version"
2828

2929
//coroutines
30-
coroutinesVerison = "1.4.1"
30+
coroutinesVerison = "1.4.2"
3131
coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVerison"
3232
coroutinesAndroid = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVerison"
3333

@@ -36,16 +36,16 @@ ext {
3636
livedata = "androidx.lifecycle:lifecycle-livedata:$livedataVersion"
3737

3838
//spek
39-
spekVersion = "2.0.13"
39+
spekVersion = "2.0.15"
4040
spekDslJvm = "org.spekframework.spek2:spek-dsl-jvm:$spekVersion"
4141
spekDslRunner = "org.spekframework.spek2:spek-runner-junit5:$spekVersion"
4242

4343
//assertJ
44-
assertJCoreVerison = "3.18.0"
44+
assertJCoreVerison = "3.18.1"
4545
assertJCore = "org.assertj:assertj-core:$assertJCoreVerison"
4646

4747
//mock
48-
mockKVersion = "1.10.2"
48+
mockKVersion = "1.10.3"
4949
mockK = "io.mockk:mockk:$mockKVersion"
5050

5151

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

powerpermission-livedata/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: "com.android.library"
22
apply plugin: "kotlin-android"
3-
apply plugin: "kotlin-android-extensions"
43
apply plugin: "maven-publish"
54
apply plugin: "com.jfrog.bintray"
65

powerpermission-rxjava2/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: "com.android.library"
22
apply plugin: "kotlin-android"
3-
apply plugin: "kotlin-android-extensions"
43
apply plugin: "maven-publish"
54
apply plugin: "com.jfrog.bintray"
65

powerpermission-rxjava3/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: "com.android.library"
22
apply plugin: "kotlin-android"
3-
apply plugin: "kotlin-android-extensions"
43
apply plugin: "maven-publish"
54
apply plugin: "com.jfrog.bintray"
65

powerpermission/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: "com.android.library"
22
apply plugin: "kotlin-android"
3-
apply plugin: "kotlin-android-extensions"
43
apply plugin: "de.mannodermaus.android-junit5"
54
apply plugin: "maven-publish"
65
apply plugin: "com.jfrog.bintray"

0 commit comments

Comments
 (0)