Skip to content

Commit a7c0ac2

Browse files
committed
[tinker-sample-android] fix compile issues in demo app.
1 parent 58fbafc commit a7c0ac2

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

tinker-sample-android/app/build.gradle

+6-3
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ def javaVersion = JavaVersion.VERSION_1_7
4848

4949
android {
5050
compileSdkVersion 26
51-
buildToolsVersion '26.0.2'
51+
52+
if (!is_gradle_3()) {
53+
buildToolsVersion '26.0.2'
54+
}
5255

5356
compileOptions {
5457
sourceCompatibility javaVersion
@@ -148,11 +151,11 @@ ext {
148151

149152
//for normal build
150153
//old apk file to build patch apk
151-
tinkerOldApkPath = "${bakPath}/app-debug-1018-17-32-47.apk"
154+
tinkerOldApkPath = "${bakPath}/app-debug-0424-15-02-56.apk"
152155
//proguard mapping file to build patch apk
153156
tinkerApplyMappingPath = "${bakPath}/app-debug-1018-17-32-47-mapping.txt"
154157
//resource R.txt to build patch apk, must input if there is resource changed
155-
tinkerApplyResourcePath = "${bakPath}/app-debug-1018-17-32-47-R.txt"
158+
tinkerApplyResourcePath = "${bakPath}/app-debug-0424-15-02-56-R.txt"
156159

157160
//only use for build all flavor, if not, just ignore this field
158161
tinkerBuildFlavorDirectory = "${bakPath}/app-1018-17-32-47"

tinker-sample-android/app/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<manifest package="tinker.sample.android"
33
xmlns:android="http://schemas.android.com/apk/res/android">
44

5-
<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="22"/>
6-
75
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
86
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
97

@@ -14,6 +12,7 @@
1412
android:theme="@style/AppTheme">
1513
<service
1614
android:name=".service.SampleResultService"
15+
android:permission="android.permission.BIND_JOB_SERVICE"
1716
android:exported="false"/>
1817

1918
<activity android:name=".app.MainActivity">

tinker-sample-android/build.gradle

+2-8
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ buildscript {
33
repositories {
44
mavenLocal()
55
jcenter()
6-
maven {
7-
url 'https://maven.google.com/'
8-
name 'Google'
9-
}
6+
google()
107
}
118
dependencies {
129
if (project.hasProperty('GRADLE_3') && GRADLE_3.equalsIgnoreCase('TRUE')) {
@@ -29,10 +26,7 @@ allprojects {
2926
repositories {
3027
mavenLocal()
3128
jcenter()
32-
maven {
33-
url 'https://maven.google.com/'
34-
name 'Google'
35-
}
29+
google()
3630
}
3731
}
3832

0 commit comments

Comments
 (0)