diff --git a/README.md b/README.md index 830d849..dc4cf5c 100644 --- a/README.md +++ b/README.md @@ -316,6 +316,9 @@ println("------>>${MyRedux.instance.currState().result}") ``` ## Change Logs +#### v1.6.6 +* 优化Gradle依赖方式 + #### v1.6.4 * ViewModel中支持从非主线程中推送数据 diff --git a/app/build.gradle b/app/build.gradle index ac03ca5..bb3da59 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,6 +28,8 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // Project implementation project(':common') + // JetPack + implementation "androidx.swiperefreshlayout:swiperefreshlayout:$refresh_layout_version" // ReactiveX implementation "com.jakewharton.rxbinding2:rxbinding:$rxbinding_version" } \ No newline at end of file diff --git a/app/src/main/java/my/itgungnir/rxmvvm/App.kt b/app/src/main/java/my/itgungnir/rxmvvm/App.kt index 1202e1d..b79800c 100755 --- a/app/src/main/java/my/itgungnir/rxmvvm/App.kt +++ b/app/src/main/java/my/itgungnir/rxmvvm/App.kt @@ -1,7 +1,6 @@ package my.itgungnir.rxmvvm import androidx.multidex.MultiDexApplication -import com.squareup.leakcanary.LeakCanary import my.itgungnir.rxmvvm.common.redux.MyRedux class App : MultiDexApplication() { @@ -10,10 +9,5 @@ class App : MultiDexApplication() { super.onCreate() MyRedux.init(this) - - if (LeakCanary.isInAnalyzerProcess(this)) { - return - } - LeakCanary.install(this) } } \ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle index 2c84b6d..870e418 100755 --- a/common/build.gradle +++ b/common/build.gradle @@ -21,10 +21,12 @@ dependencies { // Project api project(':rx_mvvm') // Kotlin - api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - // Support + api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + // JetPack + api "androidx.appcompat:appcompat:$support_version" api "com.google.android.material:material:$material_version" api "androidx.recyclerview:recyclerview:$recyclerview_version" + api "androidx.lifecycle:lifecycle-extensions:$lifecycle_version" // ReactiveX api "io.reactivex.rxjava2:rxjava:$rxjava_version" api "io.reactivex.rxjava2:rxandroid:$rxandroid_version" diff --git a/config.gradle b/config.gradle index 02b4df9..094d20c 100755 --- a/config.gradle +++ b/config.gradle @@ -1,31 +1,32 @@ ext { // Build - gradle_version = '3.5.3' + gradle_version = '4.0.1' target_sdk_version = 28 min_sdk_version = 19 version_code = 1 version_name = '1.0' jdk_version = JavaVersion.VERSION_1_8 // Kotlin - kotlin_version = '1.3.50' - // Support + kotlin_version = '1.3.72' + // JetPack + appcompat_version = '1.1.0' support_version = '1.1.0' - material_version = '1.0.0' + material_version = '1.1.0' recyclerview_version = '1.1.0' - // Lifecycle lifecycle_version = '2.1.0' + refresh_layout_version = '1.1.0' // ReactiveX - rxjava_version = '2.2.15' + rxjava_version = '2.2.19' rxandroid_version = '2.1.1' rxbinding_version = '2.2.0' // Network - okhttp_version = '4.2.2' - retrofit_version = '2.6.2' + okhttp_version = '4.8.0' + retrofit_version = '2.9.0' // Tools jitpack_version = '2.1' - gson_version = '2.8.5' + gson_version = '2.8.6' dex_version = '2.0.1' - leak_canary_version = '2.1' + leak_canary_version = '2.4' } static def addRepos(RepositoryHandler handler) { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cc9235a..7627900 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/rx_mvvm/build.gradle b/rx_mvvm/build.gradle index a7efc60..b25891d 100755 --- a/rx_mvvm/build.gradle +++ b/rx_mvvm/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'com.android.library' -apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' apply plugin: 'com.github.dcendents.android-maven' group = 'com.github.ITGungnir' @@ -22,12 +22,12 @@ android { } dependencies { - // AndroidX - implementation "androidx.appcompat:appcompat:$support_version" - implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version" // Kotlin implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + // JetPack + compileOnly "androidx.appcompat:appcompat:$support_version" + compileOnly "androidx.lifecycle:lifecycle-extensions:$lifecycle_version" // Tools - implementation "com.google.code.gson:gson:$gson_version" + compileOnly "com.google.code.gson:gson:$gson_version" }