更新服务器地址，以及最新的库版本

taowenyin · Jan 14, 2019 · b21f1d5 · b21f1d5
1 parent f79a6f9
commit b21f1d5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,8 @@ android:
   - tools
   - tools
   - platform-tools
-  - build-tools-26.0.3
-  - android-26
+  - build-tools-28.0.3
+  - android-28
   - extra-google-google_play_services
   - extra-google-m2repository
   - extra-android-m2repository

diff --git a/app/build.gradle b/app/build.gradle
@@ -11,12 +11,12 @@ def gitCommitCount = Integer.parseInt('git rev-list HEAD --count'.execute([], pr
 def gitCurrentTag = 'git describe --tags --abbrev=0'.execute([], project.rootDir).text.trim()
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
     defaultConfig {
         applicationId "cn.edu.siso.rlxapf"
         minSdkVersion 15
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode gitCommitCount
         versionName gitCurrentTag
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -46,27 +46,27 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation files('libs/usr_cloud_com.jar')
     implementation files('libs/usrcloud.jar')
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support:support-v4:26.1.0'
-    implementation 'com.android.support:design:26.1.0'
-    implementation 'com.android.support:support-vector-drawable:26.1.0'
-    implementation 'com.android.support:preference-v7:26.1.0'
-    implementation 'com.android.support:preference-v14:26.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.android.support:support-vector-drawable:28.0.0'
+    implementation 'com.android.support:preference-v7:28.0.0'
+    implementation 'com.android.support:preference-v14:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     implementation 'com.truizlop.sectionedrecyclerview:library:1.2.0'
     implementation 'com.github.lecho:hellocharts-library:1.5.8@aar'
     implementation 'de.hdodenhof:circleimageview:2.1.0'
-    implementation 'com.alibaba:fastjson:1.2.40'
-    implementation 'com.squareup.okhttp3:okhttp:3.8.1'
+    implementation 'com.alibaba:fastjson:1.2.54'
+    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
     implementation 'com.github.sahasbhop:apng-view:1.3'
-    implementation 'org.apache.commons:commons-lang3:3.6'
+    implementation 'org.apache.commons:commons-lang3:3.8.1'
     implementation 'com.tencent.bugly:crashreport:2.6.6.1'
 
     implementation 'eu.davidea:flexible-adapter:5.0.0-rc2'
     implementation 'eu.davidea:flexible-adapter-databinding:1.0.0-b1@aar'
     implementation 'eu.davidea:flexible-adapter:5.0.0-SNAPSHOT'
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
     <string name="app_name">RLXAPF</string>
 
-    <string name="base_url">http://www.suzhoulixu.com</string>
+    <string name="base_url">http://www.lixuelectric.com</string>
 
     <string name="title_activity_first">FirstActivity</string>
     <string name="title_activity_login">登录</string>

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url "https://maven.google.com" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Nov 11 16:14:50 CST 2017
+#Mon Jan 14 08:39:53 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip