diff --git a/gradle.properties b/gradle.properties index 2005127df169de8a13b77c68247641d1e1962762..c90da4996697d3df49d76a7564fbae50bda050c0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,4 +20,4 @@ isUseBooster=false android.useAndroidX=true android.enableJetifier=true -android.enableR8=false \ No newline at end of file +android.enableD8=true diff --git a/versions.gradle b/versions.gradle index 5bd563e9d3ad1cc819882f88c2162b286e2aa16d..377ebe42d87600835d73ae912253538c8b6c4a66 100644 --- a/versions.gradle +++ b/versions.gradle @@ -12,38 +12,17 @@ versions.android_maven_gradle_plugin = "2.0" versions.gradle_bintray_plugin = "1.8.0" versions.booster = "1.4.0" versions.booster_all = "1.1.1" -versions.arch_core = "2.0.0" -versions.room = "2.1.0-alpha03" -versions.lifecycle = "2.0.0" versions.support = "28.0.0" versions.androidx = "1.1.0" -versions.dagger = "2.16" versions.junit = "4.12" versions.espresso = "3.2.0" -versions.retrofit = "2.3.0" -versions.okhttp_logging_interceptor = "3.9.0" -versions.mockwebserver = "3.8.1" -versions.apache_commons = "2.5" -versions.mockito = "2.7.19" -versions.mockito_all = "1.10.19" -versions.dexmaker = "2.2.0" versions.constraint_layout = "1.1.3" versions.glide = "4.11.0" -versions.timber = "4.5.1" versions.rxjava2 = "2.2.0" versions.rx_android = "2.1.0" -versions.atsl_runner = "1.0.1" -versions.atsl_rules = "1.0.1" -versions.hamcrest = "1.3" -versions.kotlin = "1.2.20" -versions.paging = "1.0.0-alpha5" versions.butterknife = "10.1.0" versions.runner = "1.2.0" versions.gson = "2.8.5" -versions.okhttp3 = "3.13.1" -versions.nineoldandroids = "2.4.0" -versions.calligraphy = "2.3.0" -versions.godeye = "1.7.4" def deps = [:] @@ -97,102 +76,28 @@ booster.transform_toast = "com.didiglobal.booster:booster-transform-toast:$versi booster.transform_activity_thread = "com.didiglobal.booster:booster-transform-activity-thread:$versions.booster" deps.booster = booster -def room = [:] -room.runtime = "android.arch.persistence.room:runtime:$versions.room" -room.compiler = "android.arch.persistence.room:compiler:$versions.room" -room.rxjava2 = "android.arch.persistence.room:rxjava2:$versions.room" -room.testing = "android.arch.persistence.room:testing:$versions.room" -deps.room = room - -def lifecycle = [:] -lifecycle.runtime = "android.arch.lifecycle:runtime:$versions.lifecycle" -lifecycle.extensions = "android.arch.lifecycle:extensions:$versions.lifecycle" -lifecycle.java8 = "android.arch.lifecycle:common-java8:$versions.lifecycle" -lifecycle.compiler = "android.arch.lifecycle:compiler:$versions.lifecycle" -deps.lifecycle = lifecycle - -def arch_core = [:] -arch_core.testing = "android.arch.core:core-testing:$versions.arch_core" -deps.arch_core = arch_core - -def retrofit = [:] -retrofit.runtime = "com.squareup.retrofit2:retrofit:$versions.retrofit" -retrofit.gson = "com.squareup.retrofit2:converter-gson:$versions.retrofit" -retrofit.mock = "com.squareup.retrofit2:retrofit-mock:$versions.retrofit" -deps.retrofit = retrofit -deps.okhttp_logging_interceptor = "com.squareup.okhttp3:logging-interceptor:${versions.okhttp_logging_interceptor}" - -def dagger = [:] -dagger.runtime = "com.google.dagger:dagger:$versions.dagger" -dagger.android = "com.google.dagger:dagger-android:$versions.dagger" -dagger.android_support = "com.google.dagger:dagger-android-support:$versions.dagger" -dagger.compiler = "com.google.dagger:dagger-compiler:$versions.dagger" -dagger.android_support_compiler = "com.google.dagger:dagger-android-processor:$versions.dagger" - -deps.dagger = dagger - def butterknife = [:] butterknife.runtime = "com.jakewharton:butterknife:$versions.butterknife" butterknife.compiler = "com.jakewharton:butterknife-compiler:$versions.butterknife" deps.butterknife = butterknife -def arouter = [:] -arouter.api = "com.alibaba:arouter-api:1.3.1" -arouter.compiler = "com.alibaba:arouter-compiler:1.1.4" - -deps.arouter = arouter - def espresso = [:] espresso.core = "androidx.test.espresso:espresso-core:$versions.espresso" espresso.contrib = "androidx.test.espresso:espresso-contrib:$versions.espresso" espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso" deps.espresso = espresso -def atsl = [:] -atsl.runner = "com.android.support.test:runner:$versions.atsl_runner" -atsl.rules = "com.android.support.test:rules:$versions.atsl_runner" -deps.atsl = atsl - -def mockito = [:] -mockito.core = "org.mockito:mockito-core:$versions.mockito" -mockito.all = "org.mockito:mockito-all:$versions.mockito_all" -deps.mockito = mockito - -def kotlin = [:] -kotlin.stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jre7:$versions.kotlin" -kotlin.test = "org.jetbrains.kotlin:kotlin-test-junit:$versions.kotlin" -kotlin.plugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin" - -deps.kotlin = kotlin - -def godeye = [:] -godeye.core = "cn.hikyson.godeye:godeye-core:$versions.godeye" -godeye.toolbox = "cn.hikyson.godeye:godeye-toolbox:$versions.godeye" -godeye.monitor = "cn.hikyson.godeye:godeye-monitor:$versions.godeye" -godeye.monitor_no_op = "cn.hikyson.godeye:godeye-monitor-no-op:$versions.godeye" - -deps.godeye = godeye - deps.android_gradle_plugin = "com.android.tools.build:gradle:$versions.android_gradle_plugin" deps.android_maven_gradle_plugin = "com.github.dcendents:android-maven-gradle-plugin:$versions.android_maven_gradle_plugin" deps.gradle_bintray_plugin = "com.jfrog.bintray.gradle:gradle-bintray-plugin:$versions.gradle_bintray_plugin" -deps.freeline_gradle_plugin = "com.antfortune.freeline:gradle:0.8.8" -deps.paging = "android.arch.paging:runtime:$versions.paging" deps.glide = "com.github.bumptech.glide:glide:$versions.glide" -deps.dexmaker = "com.linkedin.dexmaker:dexmaker-mockito:$versions.dexmaker" deps.constraint_layout = "androidx.constraint:constraint-layout:$versions.constraint_layout" -deps.timber = "com.jakewharton.timber:timber:$versions.timber" deps.junit = "junit:junit:$versions.junit" deps.runner = "androidx.test:runner:$versions.runner" -deps.mock_web_server = "com.squareup.okhttp3:mockwebserver:$versions.mockwebserver" deps.rxjava2 = "io.reactivex.rxjava2:rxjava:$versions.rxjava2" deps.rx_android = "io.reactivex.rxjava2:rxandroid:$versions.rx_android" -deps.hamcrest = "org.hamcrest:hamcrest-all:$versions.hamcrest" deps.gson = "com.google.code.gson:gson:$versions.gson" -deps.okhttp3 = "com.squareup.okhttp3:okhttp:$versions.okhttp3" -deps.nineoldandroids = "com.nineoldandroids:library:$versions.nineoldandroids" -deps.calligraphy = "uk.co.chrisjenx:calligraphy:$versions.calligraphy" ext.deps = deps @@ -215,7 +120,7 @@ ext.app_release = app_release */ def isRelease() { Gradle gradle = getGradle() - String tskReqStr = gradle.getStartParameter().getTaskRequests().toString() + String tskReqStr = gradle.getStartParameter().getTaskRequests().toString() Pattern pattern if (tskReqStr.contains("assemble")) { @@ -235,21 +140,21 @@ def isRelease() { return true } } + ext.isRelease = this.&isRelease //默认添加代码仓库路径 static def addRepos(RepositoryHandler handler) { - handler.google() - //Add the aliyun repository - handler.maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'} - //Add the JitPack repository + handler.mavenLocal() + handler.google { url 'https://maven.aliyun.com/repository/google' } + handler.jcenter { url 'https://maven.aliyun.com/repository/jcenter' } + handler.mavenCentral { url 'https://maven.aliyun.com/repository/central' } handler.maven { url "https://jitpack.io" } - handler.jcenter() - handler.mavenCentral() + handler.maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' } handler.maven { url "https://dl.bintray.com/umsdk/release" } - handler.maven{ url 'https://oss.sonatype.org/content/repositories/public'} + handler.maven { url 'https://oss.sonatype.org/content/repositories/public' } //Add the Local repository - handler.maven{ url 'LocalRepository'} + handler.maven { url 'LocalRepository' } } ext.addRepos = this.&addRepos