Skip to content

Commit

Permalink
Update gradle plugin and dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
zhi1ong committed Dec 4, 2018
1 parent d628164 commit 601ff74
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 31 deletions.
16 changes: 7 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,14 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])

annotationProcessor project(':arouter-compiler')
compile project(':arouter-api')
compile project(':module-java')
compile project(':module-kotlin')
compile project(':arouter-annotation')
implementation project(':arouter-api')
implementation project(':module-java')
implementation project(':module-kotlin')
implementation project(':arouter-annotation')

compile 'com.alibaba:fastjson:1.2.9'
implementation 'com.alibaba:fastjson:1.2.48'

compile "com.android.support:support-v4:${SUPPORT_LIB_VERSION}"
compile "com.android.support:appcompat-v7:${SUPPORT_LIB_VERSION}"
implementation "com.android.support:support-v4:${SUPPORT_LIB_VERSION}"
implementation "com.android.support:appcompat-v7:${SUPPORT_LIB_VERSION}"
}
4 changes: 2 additions & 2 deletions arouter-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ android {

dependencies {
annotationProcessor 'com.alibaba:arouter-compiler:1.2.0'
compile 'com.alibaba:arouter-annotation:1.0.6'
compile "com.android.support:support-v4:${SUPPORT_LIB_VERSION}"
implementation 'com.alibaba:arouter-annotation:1.0.6'
implementation "com.android.support:support-v4:${SUPPORT_LIB_VERSION}"
}

apply from: '../install.gradle'
Expand Down
12 changes: 6 additions & 6 deletions arouter-compiler/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ compileJava {
}

dependencies {
compile 'com.alibaba:arouter-annotation:1.0.6'
implementation 'com.alibaba:arouter-annotation:1.0.6'

compile 'com.google.auto.service:auto-service:1.0-rc2'
compile 'com.squareup:javapoet:1.7.0'
implementation 'com.google.auto.service:auto-service:1.0-rc3'
implementation 'com.squareup:javapoet:1.8.0'

compile 'org.apache.commons:commons-lang3:3.4'
compile 'org.apache.commons:commons-collections4:4.1'
implementation 'org.apache.commons:commons-lang3:3.5'
implementation 'org.apache.commons:commons-collections4:4.1'

compile 'com.alibaba:fastjson:1.2.48'
implementation 'com.alibaba:fastjson:1.2.48'
}

apply from: '../install.gradle'
Expand Down
6 changes: 4 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
buildscript {
ext.kotlin_version = '1.1.3-2'
ext.kotlin_version = '1.2.71'
ext.arouter_register_version = '1.0.2'

repositories {
jcenter()
google()
}

dependencies {
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
Expand All @@ -19,5 +20,6 @@ buildscript {
allprojects {
repositories {
jcenter()
google()
}
}
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
org.gradle.daemon=true
#org.gradle.jvmargs=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005

COMPILE_SDK_VERSION=25
BUILDTOOLS_VERSION=25.0.0
SUPPORT_LIB_VERSION=25.2.0
MIN_SDK_VERSION=12
TARGET_SDK_VERSION=25
COMPILE_SDK_VERSION=28
BUILDTOOLS_VERSION=28.0.3
SUPPORT_LIB_VERSION=28.0.0
MIN_SDK_VERSION=14
TARGET_SDK_VERSION=28

arouter_compiler_version=1.2.2
arouter_api_version=1.4.1
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
5 changes: 3 additions & 2 deletions module-java/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
apply plugin: 'com.android.library'

dependencies {
compile project(':arouter-api')
implementation project(':arouter-annotation')
implementation project(':arouter-api')
implementation "com.android.support:appcompat-v7:${SUPPORT_LIB_VERSION}"
annotationProcessor project(':arouter-compiler')
compile "com.android.support:appcompat-v7:${SUPPORT_LIB_VERSION}"
}
android {
compileSdkVersion Integer.parseInt(COMPILE_SDK_VERSION)
Expand Down
9 changes: 5 additions & 4 deletions module-kotlin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ kapt {
}

dependencies {
compile project(':arouter-api')
implementation project(':arouter-api')
implementation project(':arouter-annotation')
kapt project(':arouter-compiler')
compile "com.android.support:appcompat-v7:${SUPPORT_LIB_VERSION}"
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
compile 'com.android.support.constraint:constraint-layout:1.0.2'
implementation "com.android.support:appcompat-v7:${SUPPORT_LIB_VERSION}"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
}
android {
compileSdkVersion Integer.parseInt(COMPILE_SDK_VERSION)
Expand Down

0 comments on commit 601ff74

Please sign in to comment.