Skip to content

Commit 9053ddf

Browse files
committed
merge pr to new branch and reset master to original. detail:
Revert "update core project's kotlin to 1.2.51,androidPlugin to 3.2.1,androidTools to 28.0.3,android-maven-gradle-plugin to 2.1." This reverts commit 38bae80.
1 parent 38bae80 commit 9053ddf

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

jimu-core/build-gradle/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ apply from: '../installv1.gradle'
2121
apply from: '../bintrayv1.gradle'
2222

2323
dependencies {
24-
compile deps.android.gradlePlugin
24+
compile 'com.android.tools.build:gradle:2.3.2'
2525
compile group: 'org.javassist', name: 'javassist', version: '3.23.1-GA'
2626
//gradle sdk
2727
compile gradleApi()

jimu-core/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ buildscript {
44
'minSdk' : 14,
55
'targetSdk' : 21,
66
'compileSdk' : 27,
7-
'kotlin' : '1.2.51',
7+
'kotlin' : '1.2.30',
88
'supportLibrary': '27.0.2',
9-
'androidPlugin' : '3.2.1',
10-
'androidTools' : '28.0.3',
9+
'androidPlugin' : '2.3.1',
10+
'androidTools' : '27.0.3',
1111
]
1212

1313
ext.deps = [
@@ -52,7 +52,7 @@ buildscript {
5252

5353
publish : [
5454
'jcenter': 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2',
55-
'maven' : 'com.github.dcendents:android-maven-gradle-plugin:2.1',
55+
'maven' : 'com.github.dcendents:android-maven-gradle-plugin:1.5',
5656
],
5757

5858
jimu : [

jimu-core/componentlib/build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,23 @@ android {
4747
}
4848

4949
dependencies {
50-
implementation fileTree(include: ['*.jar'], dir: 'libs')
51-
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
50+
compile fileTree(include: ['*.jar'], dir: 'libs')
51+
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
5252
exclude group: 'com.android.support', module: 'support-annotations'
5353
})
54-
testImplementation deps.junit
55-
implementation deps.support.v7.appcompat
54+
testCompile deps.junit
55+
compile deps.support.v7.appcompat
5656

57-
// implementation project(':router-annotation')
58-
implementation deps.jimu.router_anno
59-
implementation deps.gson
57+
// compile project(':router-annotation')
58+
compile deps.jimu.router_anno
59+
compile deps.gson
6060

61-
implementation deps.report.anno
61+
compile deps.report.anno
6262
annotationProcessor deps.report.compiler
6363

6464

65-
implementation 'org.apache.commons:commons-lang3:3.4'
66-
implementation 'org.apache.commons:commons-collections4:4.1'
65+
compile 'org.apache.commons:commons-lang3:3.4'
66+
compile 'org.apache.commons:commons-collections4:4.1'
6767
}
6868

6969

0 commit comments

Comments
 (0)