Skip to content

Commit 01ee30f

Browse files
author
Roger Hu
committed
Update for Android P
1 parent e8385e0 commit 01ee30f

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed

.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ android:
66
components:
77
- tools
88
- platform-tools
9-
- build-tools-26.0.1
10-
- android-26
11-
licenses:
12-
- android-sdk-license-.+
9+
- android-28
10+
before_install:
11+
- mkdir "$ANDROID_HOME/licenses" || true
12+
- echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"
1313
script:
1414
- "./gradlew build check --daemon"
1515
after_failure: "cat $TRAVIS_BUILD_DIR/app/build/outputs/lint-results-debug.xml"

app/build.gradle

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 27
5-
buildToolsVersion "27.0.3"
4+
compileSdkVersion 28
65

76
defaultConfig {
87
applicationId "com.example.mapdemo"
98
minSdkVersion 18
10-
targetSdkVersion 27
9+
targetSdkVersion 28
1110
}
1211

1312
buildTypes {
@@ -20,7 +19,7 @@ android {
2019

2120
ext {
2221
permissionDispatcherVersion = "3.2.0"
23-
supportLibVersion = "27.1.1"
22+
supportLibVersion = "28.0.0"
2423
googlePlayVersion = "15.0.0"
2524
}
2625

app/src/main/AndroidManifest.xml

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
android:icon="@drawable/ic_launcher"
2323
android:label="@string/app_name"
2424
android:theme="@style/AppTheme" >
25+
26+
<!-- https://stackoverflow.com/a/50779232/961939 -->
27+
<uses-library android:name="org.apache.http.legacy" android:required="false" />
28+
2529
<activity
2630
android:name="com.example.mapdemo.MapDemoActivity"
2731
android:label="@string/app_name" >

build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
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 {
8-
classpath 'com.android.tools.build:gradle:3.1.2'
8+
classpath 'com.android.tools.build:gradle:3.2.0'
99
}
1010
}
1111

1212
allprojects {
1313
repositories {
14-
jcenter()
1514
google()
15+
jcenter()
1616
}
1717
}
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue May 01 22:46:38 PDT 2018
1+
#Tue Dec 04 23:49:07 PST 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

0 commit comments

Comments
 (0)