Skip to content
This repository has been archived by the owner on Mar 26, 2019. It is now read-only.

Commit

Permalink
Update version to 2.3.5, Upgrade libs
Browse files Browse the repository at this point in the history
  • Loading branch information
hearsilent committed Feb 14, 2019
1 parent 5da684f commit eff8d32
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 66 deletions.
49 changes: 24 additions & 25 deletions KUAS-AP-Material/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
}

Expand Down Expand Up @@ -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'
Expand All @@ -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
}
}
Expand Down
36 changes: 0 additions & 36 deletions KUAS-AP-Material/app/src/main/res/values-zh-rTW/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -225,42 +225,6 @@
<item>Sunday</item>
</array>

<array name="start_time">
<item>07:30</item>
<item>08:10</item>
<item>09:10</item>
<item>10:10</item>
<item>11:10</item>
<item>12:10</item>
<item>13:30</item>
<item>14:30</item>
<item>15:30</item>
<item>16:30</item>
<item>17:30</item>
<item>18:30</item>
<item>19:25</item>
<item>20:20</item>
<item>21:15</item>
</array>

<array name="end_time">
<item>08:00</item>
<item>09:00</item>
<item>10:00</item>
<item>11:00</item>
<item>12:00</item>
<item>13:00</item>
<item>14:20</item>
<item>15:20</item>
<item>16:20</item>
<item>17:20</item>
<item>18:20</item>
<item>19:20</item>
<item>20:15</item>
<item>21:10</item>
<item>22:05</item>
</array>

<array name="leave_sections">
<item>A</item>
<item>"1"</item>
Expand Down
2 changes: 1 addition & 1 deletion KUAS-AP-Material/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,6 @@
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</string>

<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="hello_blank_fragment" translatable="false">Hello blank fragment</string>
<string name="can_not_use_bus">This account can\\\'t use this feature</string>
</resources>
4 changes: 2 additions & 2 deletions KUAS-AP-Material/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions KUAS-AP-Material/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit eff8d32

Please sign in to comment.