Skip to content

Commit dc1c215

Browse files
authored
Merge pull request #1 from Blankj/master
update from origin
2 parents 763fc81 + 5278250 commit dc1c215

File tree

330 files changed

+20003
-11240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

330 files changed

+20003
-11240
lines changed

.travis.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,25 @@ language: android
22
jdk: oraclejdk8
33
sudo: false
44

5-
env:
6-
global:
7-
- COMPILE_SDK_VERSION = 25
8-
- BUILD_TOOLS_VERSION = 25.0.2
9-
105
android:
116
components:
7+
- tools
128
- platform-tools
139
- tools
14-
- build-tools-$BUILD_TOOLS_VERSION
15-
- android-$COMPILE_SDK_VERSION
10+
- build-tools-26.0.2
11+
- android-26
1612

1713
licenses:
18-
- android-sdk-license-.+
14+
- 'android-sdk-license-.+'
1915
- '.+'
2016

2117
notifications:
2218
email: false
2319

2420
before_install:
25-
- chmod +x gradlew
2621
- mkdir "$ANDROID_HOME/licenses" || true
2722
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
2823
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
2924

3025
script:
31-
- ./gradlew build connectedCheck
26+
- ./gradlew build connectedCheck --info

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright {yyyy} {name of copyright owner}
189+
Copyright 2017 Blankj
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)