From eff8d32e46cd52859f11038a295f92f5e46d316f Mon Sep 17 00:00:00 2001 From: HearSilent Date: Thu, 14 Feb 2019 13:11:19 +0800 Subject: [PATCH] Update version to 2.3.5, Upgrade libs --- KUAS-AP-Material/app/build.gradle | 49 +++++++++---------- .../src/main/res/values-zh-rTW/strings.xml | 36 -------------- .../app/src/main/res/values/strings.xml | 2 +- KUAS-AP-Material/build.gradle | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 4 +- 5 files changed, 29 insertions(+), 66 deletions(-) diff --git a/KUAS-AP-Material/app/build.gradle b/KUAS-AP-Material/app/build.gradle index ff975b8..3c78a4d 100644 --- a/KUAS-AP-Material/app/build.gradle +++ b/KUAS-AP-Material/app/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { - classpath 'io.fabric.tools:gradle:1.25.4' + classpath 'io.fabric.tools:gradle:1.27.0' } } apply plugin: 'com.android.application' @@ -16,15 +16,14 @@ repositories { android { - compileSdkVersion 27 - buildToolsVersion "27.0.3" + compileSdkVersion 28 defaultConfig { applicationId "com.kuas.ap" minSdkVersion 15 - targetSdkVersion 27 - versionCode 20304 - versionName "2.3.4" + targetSdkVersion 28 + versionCode 20305 + versionName "2.3.5" multiDexEnabled true } @@ -69,24 +68,24 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'com.android.support:multidex:1.0.3' - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' - implementation 'com.android.support:customtabs:27.1.1' - implementation 'com.android.support:cardview-v7:27.1.1' - implementation 'com.android.support:recyclerview-v7:27.1.1' - implementation 'com.android.support:animated-vector-drawable:27.1.1' - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:support-annotations:27.1.1' - implementation 'com.android.support:support-compat:27.1.1' - implementation 'com.android.support:support-core-ui:27.1.1' - implementation 'com.android.support:support-core-utils:27.1.1' - implementation 'com.android.support:support-fragment:27.1.1' - implementation 'com.android.support:support-media-compat:27.1.1' - implementation 'com.android.support:support-v13:27.1.1' - implementation 'com.android.support:support-v4:27.1.1' - implementation 'com.android.support:support-vector-drawable:27.1.1' - implementation 'com.android.support:transition:27.1.1' - implementation 'com.android.support.constraint:constraint-layout:1.1.2' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' + implementation 'com.android.support:customtabs:28.0.0' + implementation 'com.android.support:cardview-v7:28.0.0' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:animated-vector-drawable:28.0.0' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:support-annotations:28.0.0' + implementation 'com.android.support:support-compat:28.0.0' + implementation 'com.android.support:support-core-ui:28.0.0' + implementation 'com.android.support:support-core-utils:28.0.0' + implementation 'com.android.support:support-fragment:28.0.0' + implementation 'com.android.support:support-media-compat:28.0.0' + implementation 'com.android.support:support-v13:28.0.0' + implementation 'com.android.support:support-v4:28.0.0' + implementation 'com.android.support:support-vector-drawable:28.0.0' + implementation 'com.android.support:transition:28.0.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.google.android.gms:play-services-analytics:16.0.3' implementation 'com.google.android.gms:play-services-measurement-base:16.0.2' implementation 'com.google.firebase:firebase-core:16.0.3' @@ -95,7 +94,7 @@ dependencies { implementation 'com.google.code.gson:gson:2.8.5' implementation 'com.wdullaer:materialdatetimepicker:3.6.3' implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' - implementation('com.crashlytics.sdk.android:crashlytics:2.9.5@aar') { + implementation('com.crashlytics.sdk.android:crashlytics:2.9.9@aar') { transitive = true } } diff --git a/KUAS-AP-Material/app/src/main/res/values-zh-rTW/strings.xml b/KUAS-AP-Material/app/src/main/res/values-zh-rTW/strings.xml index 14c3341..3258352 100644 --- a/KUAS-AP-Material/app/src/main/res/values-zh-rTW/strings.xml +++ b/KUAS-AP-Material/app/src/main/res/values-zh-rTW/strings.xml @@ -225,42 +225,6 @@ Sunday - - 07:30 - 08:10 - 09:10 - 10:10 - 11:10 - 12:10 - 13:30 - 14:30 - 15:30 - 16:30 - 17:30 - 18:30 - 19:25 - 20:20 - 21:15 - - - - 08:00 - 09:00 - 10:00 - 11:00 - 12:00 - 13:00 - 14:20 - 15:20 - 16:20 - 17:20 - 18:20 - 19:20 - 20:15 - 21:10 - 22:05 - - A "1" diff --git a/KUAS-AP-Material/app/src/main/res/values/strings.xml b/KUAS-AP-Material/app/src/main/res/values/strings.xml index 65d27d5..332c887 100644 --- a/KUAS-AP-Material/app/src/main/res/values/strings.xml +++ b/KUAS-AP-Material/app/src/main/res/values/strings.xml @@ -367,6 +367,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - Hello blank fragment + Hello blank fragment This account can\\\'t use this feature \ No newline at end of file diff --git a/KUAS-AP-Material/build.gradle b/KUAS-AP-Material/build.gradle index 7c6fe12..1d88f7d 100644 --- a/KUAS-AP-Material/build.gradle +++ b/KUAS-AP-Material/build.gradle @@ -6,8 +6,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.google.gms:google-services:4.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/KUAS-AP-Material/gradle/wrapper/gradle-wrapper.properties b/KUAS-AP-Material/gradle/wrapper/gradle-wrapper.properties index cfc079f..b8e2e34 100644 --- a/KUAS-AP-Material/gradle/wrapper/gradle-wrapper.properties +++ b/KUAS-AP-Material/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Aug 16 17:06:25 CST 2018 +#Thu Feb 14 12:52:31 CST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip