Skip to content

Commit

Permalink
Upgrade: upgraded the third-party libraries all version.
Browse files Browse the repository at this point in the history
  • Loading branch information
pokk committed Aug 29, 2018
1 parent 2167439 commit c507f43
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 27 deletions.
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ allprojects {
And add our dependency to your app `bundle.gradle`.

```gradle
implementation 'com.devrapid.jieyi:kotlinknifer:2.0.1'
implementation 'com.devrapid.jieyi:kotlinknifer:2.0.2'
implementation 'com.devrapid.jieyi:kotlinshaver:1.0.1'
implementation 'com.devrapid.jieyi:kotlinshaver:1.0.2'
```

Then you can use it!!!
Expand All @@ -101,14 +101,14 @@ Then you can use it!!!
<dependency>
<groupId>com.devrapid.jieyi</groupId>
<artifactId>kotlinknifer</artifactId>
<version>2.0.1</version>
<version>2.0.2</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.devrapid.jieyi</groupId>
<artifactId>kotlinshaver</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
<type>pom</type>
</dependency>
```
Expand All @@ -117,19 +117,19 @@ Then you can use it!!!

## kotlinknifer

1. Gson 2.8.2
2. Glide 4.6.1
1. Gson 2.8.5
2. Glide 4.8.0

## kotlinshaver
### For Androidx

1. RxJava 2.1.10
2. RxKotlin 2.2.0
1. RxJava 2.2.1
2. RxKotlin 2.3.0

If you'd not like to use them to your project, you can add the exclude as like below

```gradle
implementation('com.devrapid.jieyi:kotlinknifer:2.0.1', {
implementation('com.devrapid.jieyi:kotlinknifer:2.0.2', {
exclude group: 'com.google.code.gson', module: 'gson'
exclude group: 'com.github.bumptech.glide', module: 'glide'
})
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.2.51'
ext.kotlin_version = '1.2.61'
repositories {
jcenter()
google()
Expand All @@ -12,7 +12,7 @@ buildscript {
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3"
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0"
classpath "com.github.dcendents:android-maven-gradle-plugin:1.5"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ proj_name=kotlinknifer
proj_libname=KotlinKnifer
proj_group=com.devrapid.jieyi
proj_artifactid=kotlinknifer
proj_version=2.0.1
proj_version=2.0.2
proj_description=For developing an Android conveniently and rapidly.
proj_websiteurl=https://github.com/pokk/KotlinKnifer
proj_issuetrackerurl=https://github.com/pokk/KotlinKnifer/issues
Expand All @@ -39,4 +39,4 @@ [email protected]
proj_kotlin_name=kotlinshaver
proj_kotlin_libname=KotlinShaver
proj_kotlin_artifactid=kotlinshaver
proj_kotlin_version=1.0.1
proj_kotlin_version=1.0.2
16 changes: 8 additions & 8 deletions kotlinknifer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ kotlin {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
// 'compile' can also import to the new project with this.
compile 'com.google.code.gson:gson:2.8.2'
compile 'com.github.bumptech.glide:glide:4.7.1'
compile 'com.google.code.gson:gson:2.8.5'
compile 'com.github.bumptech.glide:glide:4.8.0'
// 'implementation' can't import to the new project.
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.23.3'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-common:0.23.3'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:0.23.3'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.25.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-common:0.25.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:0.25.0'
implementation 'org.jetbrains.anko:anko-commons:0.10.5'
implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
implementation 'androidx.recyclerview:recyclerview:1.0.0-beta01'
implementation 'androidx.palette:palette:1.0.0-beta01'
implementation 'androidx.appcompat:appcompat:1.0.0-rc02'
implementation 'androidx.recyclerview:recyclerview:1.0.0-rc02'
implementation 'androidx.palette:palette:1.0.0-rc02'
compile project(':kotlinshaver')
}

Expand Down
8 changes: 4 additions & 4 deletions kotlinshaver/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ apply plugin: 'kotlin'

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.23.3'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-common:0.23.3'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.25.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-common:0.25.0'

compile 'io.reactivex.rxjava2:rxkotlin:2.2.0'
compile 'io.reactivex.rxjava2:rxjava:2.1.10'
compile 'io.reactivex.rxjava2:rxkotlin:2.3.0'
compile 'io.reactivex.rxjava2:rxjava:2.2.1'
}

sourceCompatibility = "1.8"
Expand Down
4 changes: 2 additions & 2 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ android {

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha1'
implementation 'androidx.appcompat:appcompat:1.0.0-rc02'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation project(':kotlinknifer')
// implementation "com.devrapid.jieyi:kotlinknifer:1.4.1"
Expand Down

0 comments on commit c507f43

Please sign in to comment.