Skip to content
This repository was archived by the owner on Jun 8, 2024. It is now read-only.

Commit bc1feee

Browse files
fythonfython
committed
Project: Update Support libraries
Signed-off-by: Fung <fython@163.com>
1 parent ae3244f commit bc1feee

8 files changed

Lines changed: 21 additions & 42 deletions

File tree

‎build.gradle‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.android_support_lib_version = '26.0.0-beta2'
2+
ext.android_support_lib_version = '26.0.0'
33
repositories {
44
jcenter()
55
}
@@ -11,12 +11,8 @@ buildscript {
1111
allprojects {
1212
repositories {
1313
jcenter()
14-
maven {
15-
url "https://jitpack.io"
16-
}
17-
maven {
18-
url "https://maven.google.com"
19-
}
14+
maven { url 'https://jitpack.io' }
15+
maven { url 'https://maven.google.com' }
2016
}
2117
}
2218

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
org.gradle.jvmargs=-Xmx1536m
2-
BUILD_TOOLS_VERSION=26.0.0
2+
BUILD_TOOLS_VERSION=26.0.1
33
VERSION_NAME=2.7.0
44
TARGET_SDK_VERSION=26
55
VERSION_CODE=37

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ 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-2.14.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

‎libraries/AdvancedRecyclerView/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
apply plugin: 'com.android.library'
1818

1919
android {
20-
compileSdkVersion 25
21-
buildToolsVersion "25.0.2"
20+
compileSdkVersion TARGET_SDK_VERSION.toInteger()
21+
buildToolsVersion BUILD_TOOLS_VERSION
2222

2323
defaultConfig {
24-
minSdkVersion 9
25-
targetSdkVersion 25
24+
minSdkVersion MIN_SDK_VERSION.toInteger()
25+
targetSdkVersion TARGET_SDK_VERSION.toInteger()
2626

2727
versionCode 1
2828
versionName "1"
@@ -42,8 +42,8 @@ android {
4242
}
4343

4444
dependencies {
45-
compile 'com.android.support:appcompat-v7:25.1.0'
46-
compile 'com.android.support:recyclerview-v7:25.1.0'
45+
compile "com.android.support:appcompat-v7:$android_support_lib_version"
46+
compile "com.android.support:recyclerview-v7:$android_support_lib_version"
4747
}
4848

4949
tasks.withType(JavaCompile) {

‎libraries/AdvancedRecyclerView/library-data.properties‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎libraries/StatusBarCompat/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "25.0.2"
4+
compileSdkVersion TARGET_SDK_VERSION.toInteger()
5+
buildToolsVersion BUILD_TOOLS_VERSION
66

77
defaultConfig {
8-
minSdkVersion 15
9-
targetSdkVersion 25
8+
minSdkVersion MIN_SDK_VERSION.toInteger()
9+
targetSdkVersion TARGET_SDK_VERSION.toInteger()
1010
versionCode 1
1111
versionName "1.0"
1212
}
@@ -20,5 +20,5 @@ android {
2020

2121
dependencies {
2222
compile fileTree(dir: 'libs', include: ['*.jar'])
23-
compile 'com.android.support:appcompat-v7:25.1.0'
23+
compile "com.android.support:appcompat-v7:$android_support_lib_version"
2424
}

‎mobile/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ dependencies {
2929
compile project(':libraries:StatusBarCompat')
3030
compile project(':bottom-bar-1.4.0.1')
3131
compile "com.android.support:appcompat-v7:$android_support_lib_version"
32-
compile "com.android.support:cardview-v7:$android_support_lib_version"
32+
compile "com.android.support:cardview-v7:26.0.0-beta2"
3333
compile "com.android.support:recyclerview-v7:$android_support_lib_version"
3434
compile "com.android.support:design:$android_support_lib_version"
35-
compile "com.android.support:customtabs:$android_support_lib_version"
35+
compile "com.android.support:customtabs:26.0.0-beta2"
3636
compile 'me.drakeet.multitype:multitype:3.1.0'
3737
compile 'com.google.code.gson:gson:2.8.0'
3838
compile 'com.squareup.okhttp3:okhttp:3.6.0'

‎mobile/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
23
package="info.papdt.express.helper">
34

45
<uses-permission android:name="android.permission.INTERNET"/>
56
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
67
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
78
<uses-permission android:name="android.permission.CAMERA"/>
8-
<uses-permission android:name="android.permission.READ_LOGS"/>
99
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
1010
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
1111

@@ -18,6 +18,8 @@
1818
android:fullBackupContent="true"
1919
android:theme="@style/AppTheme">
2020

21+
<meta-data android:name="android.support.VERSION" android:value="26.0.0" tools:replace="android:value"/>
22+
2123
<activity android:name=".EntryActivity"
2224
android:theme="@style/EmptyActivity">
2325
<intent-filter>

0 commit comments

Comments
 (0)