Skip to content

Commit c1a9c84

Browse files
committed
see 10/28 log
1 parent 60b00b6 commit c1a9c84

File tree

7 files changed

+20
-20
lines changed

7 files changed

+20
-20
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ sudo: false
44

55
env:
66
global:
7-
- COMPILE_SDK_VERSION = 25
8-
- BUILD_TOOLS_VERSION = 25.0.2
7+
- COMPILE_SDK_VERSION = 26
8+
- BUILD_TOOLS_VERSION = 26.1.0
99

1010
android:
1111
components:

_config.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/build.gradle

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,18 @@ android {
5454
}
5555

5656
dependencies {
57-
compile fileTree(include: ['*.jar'], dir: 'libs')
5857
final LEAKCANARY_VERSION = '1.5';
59-
6058
def leakCanary = "com.squareup.leakcanary:leakcanary-android-no-op:$LEAKCANARY_VERSION"
6159

62-
compile project(':utilcode')
63-
compile project(':subutil')
60+
implementation fileTree(include: ['*.jar'], dir: 'libs')
61+
implementation project(':utilcode')
62+
implementation project(':subutil')
6463

65-
compile "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
66-
compile "com.android.support:support-v4:$rootProject.ext.supportVersion"
67-
compile "com.android.support:design:$rootProject.ext.supportVersion"
64+
implementation "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
65+
implementation "com.android.support:support-v4:$rootProject.ext.supportVersion"
66+
implementation "com.android.support:design:$rootProject.ext.supportVersion"
6867

69-
compile 'com.r0adkll:slidableactivity:2.0.5'
68+
implementation 'com.r0adkll:slidableactivity:2.0.5'
7069

7170
// LeakCanary
7271
debugCompile "com.squareup.leakcanary:leakcanary-android:$LEAKCANARY_VERSION"

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
33
repositories {
4-
jcenter()
54
google()
5+
jcenter()
66
}
77
dependencies {
88
classpath 'com.android.tools.build:gradle:3.0.0'
@@ -15,8 +15,8 @@ buildscript {
1515

1616
allprojects {
1717
repositories {
18-
jcenter()
1918
google()
19+
jcenter()
2020
}
2121
}
2222

@@ -27,7 +27,7 @@ task clean(type: Delete) {
2727
ext {
2828
// Sdk and tools
2929
compileSdkVersion = 26
30-
buildToolsVersion = '26.0.2'
30+
buildToolsVersion = '26.1.0'
3131
minSdkVersion = 14
3232
targetSdkVersion = 22
3333

subutil/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ android {
5353
}
5454

5555
dependencies {
56-
provided "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
57-
provided "com.android.support:support-v4:$rootProject.ext.supportVersion"
58-
provided "com.android.support:design:$rootProject.ext.supportVersion"
56+
compileOnly "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
57+
compileOnly "com.android.support:support-v4:$rootProject.ext.supportVersion"
58+
compileOnly "com.android.support:design:$rootProject.ext.supportVersion"
5959

6060
testCompile "junit:junit:$rootProject.ext.junitVersion"
6161
testCompile "org.robolectric:robolectric:$rootProject.ext.robolectricVersion"

update_log.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* 17/10/27 兼容AS3.0
12
* 17/10/27 修复LogUtils在kotlin中使用的问题
23
* 17/10/25 修复LogUtils边框,修复getBitmap从流获取
34
* 17/09/30 完善FragmentUtils,发布1.9.2

utilcode/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,13 @@ android {
5252
}
5353

5454
dependencies {
55-
provided "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
56-
provided "com.android.support:support-v4:$rootProject.ext.supportVersion"
57-
provided "com.android.support:design:$rootProject.ext.supportVersion"
55+
compileOnly "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
56+
compileOnly "com.android.support:support-v4:$rootProject.ext.supportVersion"
57+
compileOnly "com.android.support:design:$rootProject.ext.supportVersion"
5858

5959
testCompile "junit:junit:$rootProject.ext.junitVersion"
6060
testCompile "org.robolectric:robolectric:$rootProject.ext.robolectricVersion"
61+
testCompile "com.android.support:support-v4:$rootProject.ext.supportVersion"
6162
}
6263
//apply from: "../bintrayUpload.gradle"
6364
//gradle bintrayUpload

0 commit comments

Comments
 (0)