Skip to content

Commit f760f44

Browse files
author
Adrián García
committed
Upgrade project dependencies and prepare for new version
1 parent ca4c16d commit f760f44

File tree

12 files changed

+28
-35
lines changed

12 files changed

+28
-35
lines changed

CHANGELOG.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77
## [Unreleased]
88
- No new features, yet!
99

10+
## [1.3.1] - 2020-04-22
11+
### Added
12+
- Upgrade Kotlin to 1.3.72 and Kodein to 6.5.5, apart from other Android dependencies.
13+
1014
## [1.3.0] - 2020-03-13
1115
### Added
1216
- Add support for incremental annotation processing.
@@ -82,7 +86,8 @@ state (`success` or `failure`)
8286
### Added
8387
- Initial architecture release.
8488

85-
[Unreleased]: https://github.com/bq/mini-kotlin/compare/1.3.0...HEAD
89+
[Unreleased]: https://github.com/bq/mini-kotlin/compare/1.3.1...HEAD
90+
[1.3.1]: https://github.com/bq/mini-kotlin/compare/1.3.0...1.3.1
8691
[1.3.0]: https://github.com/bq/mini-kotlin/compare/1.2.0...1.3.0
8792
[1.2.0]: https://github.com/bq/mini-kotlin/compare/1.1.2...1.2.0
8893
[1.1.2]: https://github.com/bq/mini-kotlin/compare/1.1.1...1.1.2

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ Add the following dependencies to your app's `build.gradle`:
184184

185185
```groovy
186186
dependencies {
187-
def mini_version = "1.3.0"
187+
def mini_version = "1.3.1"
188188
// Minimum working dependencies
189189
implementation "com.github.bq.mini-kotlin:mini-android:$mini_version"
190190
kapt "com.github.bq.mini-kotlin:mini-processor:$mini_version"

app/build.gradle

+5-17
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
buildscript {
2-
ext {
3-
spek_version = '1.1.0'
4-
dagger_version = "2.15"
5-
rx_android_version = "2.0.2"
6-
leak_canary_version = "1.5"
7-
butterkinfe_version = "8.4.0"
8-
support_version = "27.0.0"
9-
}
10-
}
11-
121
repositories {
132
mavenCentral()
143
google()
15-
maven { url "http://dl.bintray.com/jetbrains/spek" }
164
maven { url 'https://jitpack.io' }
175
}
186

@@ -83,17 +71,17 @@ dependencies {
8371
implementation "io.reactivex.rxjava2:rxjava:$rx_version"
8472

8573
//Support
86-
implementation "androidx.core:core:1.1.0"
74+
implementation "androidx.core:core:1.2.0"
8775
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
8876

8977
//Kotlin
9078
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
9179
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
9280

93-
testImplementation 'junit:junit:4.12'
94-
androidTestImplementation 'androidx.test:runner:1.3.0-alpha02'
95-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02'
96-
androidTestImplementation 'com.agoda.kakao:kakao:2.1.0'
81+
testImplementation 'junit:junit:4.13'
82+
androidTestImplementation 'androidx.test:runner:1.3.0-beta01'
83+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-beta01'
84+
androidTestImplementation 'com.agoda.kakao:kakao:2.3.0'
9785
}
9886

9987

build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'com.gladed.androidgitversion'
33

44
buildscript {
55
ext {
6-
kotlin_version = "1.3.61"
6+
kotlin_version = "1.3.72"
77

88
android_compile_sdk = 29
99
android_target_sdk = 29
@@ -22,12 +22,12 @@ buildscript {
2222
}
2323

2424
dependencies {
25-
classpath "com.android.tools.build:gradle:3.6.1"
25+
classpath "com.android.tools.build:gradle:3.6.3"
2626
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
27-
classpath "org.junit.platform:junit-platform-gradle-plugin:1.0.0"
27+
classpath "org.junit.platform:junit-platform-gradle-plugin:1.2.0"
2828
classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
29-
classpath "com.gladed.androidgitversion:gradle-android-git-version:0.4.11"
30-
classpath "com.github.ben-manes:gradle-versions-plugin:0.21.0"
29+
classpath "com.gladed.androidgitversion:gradle-android-git-version:0.4.13"
30+
classpath "com.github.ben-manes:gradle-versions-plugin:0.28.0"
3131
}
3232
}
3333

mini-android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dependencies {
2828
api "androidx.appcompat:appcompat:1.1.0"
2929
api "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0"
3030

31-
testImplementation "junit:junit:4.12"
31+
testImplementation "junit:junit:4.13"
3232
androidTestImplementation "androidx.test:runner:1.2.0"
3333
androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
3434
}

mini-common/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ dependencies {
1212
compileOnly "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
1313
testCompileOnly "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
1414

15-
testCompileOnly 'junit:junit:4.12'
16-
testImplementation "org.amshove.kluent:kluent:1.44"
15+
testCompileOnly 'junit:junit:4.13'
16+
testImplementation "org.amshove.kluent:kluent:1.61"
1717
}
1818

1919
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {

mini-kodein-android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies {
3535
api "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
3636
api "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
3737

38-
testImplementation "junit:junit:4.12"
38+
testImplementation "junit:junit:4.13"
3939
androidTestImplementation "androidx.test:runner:1.2.0"
4040
androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
4141
}

mini-kodein/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies {
1414
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
1515
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
1616

17-
def kodein_version = "6.5.0"
17+
def kodein_version = "6.5.5"
1818
api "org.kodein.di:kodein-di-generic-jvm:$kodein_version"
1919
api "org.kodein.di:kodein-di-framework-android-x:$kodein_version"
2020
}

mini-processor/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ dependencies {
1212
compileOnly "net.ltgt.gradle.incap:incap:$incap_version"
1313
kapt "net.ltgt.gradle.incap:incap-processor:$incap_version"
1414

15-
testImplementation 'junit:junit:4.12'
16-
testImplementation 'com.google.testing.compile:compile-testing:0.15'
15+
testImplementation 'junit:junit:4.13'
16+
testImplementation 'com.google.testing.compile:compile-testing:0.18'
1717
}

mini-rx2-android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies {
3636
api "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
3737
api "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
3838

39-
testImplementation 'junit:junit:4.12'
39+
testImplementation 'junit:junit:4.13'
4040
androidTestImplementation 'androidx.test:runner:1.2.0'
4141
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
4242
}

mini-rx2/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ dependencies {
1010
implementation "io.reactivex.rxjava2:rxjava:$rx_version"
1111

1212
testApi files(project(":mini-common").sourceSets.test.runtimeClasspath) // Add mini-common test classes as dependency
13-
testCompileOnly 'junit:junit:4.12'
14-
testImplementation "org.amshove.kluent:kluent:1.44"
13+
testCompileOnly 'junit:junit:4.13'
14+
testImplementation "org.amshove.kluent:kluent:1.61"
1515
}

mini-testing/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ dependencies {
77
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
88
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
99

10-
api "junit:junit:4.12"
10+
api "junit:junit:4.13"
1111
}

0 commit comments

Comments
 (0)