Skip to content

Commit

Permalink
Upgrade project dependencies and prepare for new version
Browse files Browse the repository at this point in the history
  • Loading branch information
Adrián García committed Apr 22, 2020
1 parent ca4c16d commit f760f44
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 35 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
- No new features, yet!

## [1.3.1] - 2020-04-22
### Added
- Upgrade Kotlin to 1.3.72 and Kodein to 6.5.5, apart from other Android dependencies.

## [1.3.0] - 2020-03-13
### Added
- Add support for incremental annotation processing.
Expand Down Expand Up @@ -82,7 +86,8 @@ state (`success` or `failure`)
### Added
- Initial architecture release.

[Unreleased]: https://github.com/bq/mini-kotlin/compare/1.3.0...HEAD
[Unreleased]: https://github.com/bq/mini-kotlin/compare/1.3.1...HEAD
[1.3.1]: https://github.com/bq/mini-kotlin/compare/1.3.0...1.3.1
[1.3.0]: https://github.com/bq/mini-kotlin/compare/1.2.0...1.3.0
[1.2.0]: https://github.com/bq/mini-kotlin/compare/1.1.2...1.2.0
[1.1.2]: https://github.com/bq/mini-kotlin/compare/1.1.1...1.1.2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ Add the following dependencies to your app's `build.gradle`:

```groovy
dependencies {
def mini_version = "1.3.0"
def mini_version = "1.3.1"
// Minimum working dependencies
implementation "com.github.bq.mini-kotlin:mini-android:$mini_version"
kapt "com.github.bq.mini-kotlin:mini-processor:$mini_version"
Expand Down
22 changes: 5 additions & 17 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,6 @@
buildscript {
ext {
spek_version = '1.1.0'
dagger_version = "2.15"
rx_android_version = "2.0.2"
leak_canary_version = "1.5"
butterkinfe_version = "8.4.0"
support_version = "27.0.0"
}
}

repositories {
mavenCentral()
google()
maven { url "http://dl.bintray.com/jetbrains/spek" }
maven { url 'https://jitpack.io' }
}

Expand Down Expand Up @@ -83,17 +71,17 @@ dependencies {
implementation "io.reactivex.rxjava2:rxjava:$rx_version"

//Support
implementation "androidx.core:core:1.1.0"
implementation "androidx.core:core:1.2.0"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

//Kotlin
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.3.0-alpha02'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02'
androidTestImplementation 'com.agoda.kakao:kakao:2.1.0'
testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test:runner:1.3.0-beta01'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-beta01'
androidTestImplementation 'com.agoda.kakao:kakao:2.3.0'
}


10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'com.gladed.androidgitversion'

buildscript {
ext {
kotlin_version = "1.3.61"
kotlin_version = "1.3.72"

android_compile_sdk = 29
android_target_sdk = 29
Expand All @@ -22,12 +22,12 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:3.6.1"
classpath "com.android.tools.build:gradle:3.6.3"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.junit.platform:junit-platform-gradle-plugin:1.0.0"
classpath "org.junit.platform:junit-platform-gradle-plugin:1.2.0"
classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
classpath "com.gladed.androidgitversion:gradle-android-git-version:0.4.11"
classpath "com.github.ben-manes:gradle-versions-plugin:0.21.0"
classpath "com.gladed.androidgitversion:gradle-android-git-version:0.4.13"
classpath "com.github.ben-manes:gradle-versions-plugin:0.28.0"
}
}

Expand Down
2 changes: 1 addition & 1 deletion mini-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {
api "androidx.appcompat:appcompat:1.1.0"
api "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0"

testImplementation "junit:junit:4.12"
testImplementation "junit:junit:4.13"
androidTestImplementation "androidx.test:runner:1.2.0"
androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
}
Expand Down
4 changes: 2 additions & 2 deletions mini-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ dependencies {
compileOnly "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
testCompileOnly "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"

testCompileOnly 'junit:junit:4.12'
testImplementation "org.amshove.kluent:kluent:1.44"
testCompileOnly 'junit:junit:4.13'
testImplementation "org.amshove.kluent:kluent:1.61"
}

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
Expand Down
2 changes: 1 addition & 1 deletion mini-kodein-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies {
api "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
api "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"

testImplementation "junit:junit:4.12"
testImplementation "junit:junit:4.13"
androidTestImplementation "androidx.test:runner:1.2.0"
androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
}
Expand Down
2 changes: 1 addition & 1 deletion mini-kodein/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

def kodein_version = "6.5.0"
def kodein_version = "6.5.5"
api "org.kodein.di:kodein-di-generic-jvm:$kodein_version"
api "org.kodein.di:kodein-di-framework-android-x:$kodein_version"
}
4 changes: 2 additions & 2 deletions mini-processor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ dependencies {
compileOnly "net.ltgt.gradle.incap:incap:$incap_version"
kapt "net.ltgt.gradle.incap:incap-processor:$incap_version"

testImplementation 'junit:junit:4.12'
testImplementation 'com.google.testing.compile:compile-testing:0.15'
testImplementation 'junit:junit:4.13'
testImplementation 'com.google.testing.compile:compile-testing:0.18'
}
2 changes: 1 addition & 1 deletion mini-rx2-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dependencies {
api "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
api "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"

testImplementation 'junit:junit:4.12'
testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
}
Expand Down
4 changes: 2 additions & 2 deletions mini-rx2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ dependencies {
implementation "io.reactivex.rxjava2:rxjava:$rx_version"

testApi files(project(":mini-common").sourceSets.test.runtimeClasspath) // Add mini-common test classes as dependency
testCompileOnly 'junit:junit:4.12'
testImplementation "org.amshove.kluent:kluent:1.44"
testCompileOnly 'junit:junit:4.13'
testImplementation "org.amshove.kluent:kluent:1.61"
}
2 changes: 1 addition & 1 deletion mini-testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

api "junit:junit:4.12"
api "junit:junit:4.13"
}

0 comments on commit f760f44

Please sign in to comment.