Merge branch 'develop' into 'master'

修正versioncode问题

See merge request SilverBlog/SilverBlog_Android!67

Author: qwe7002

.gitlab-ci.yml

@@ -27,7 +27,7 @@ build:
   only:
     - develop
   script:
-  - echo -e "ext { \n appVersionCode = $CI_JOB_ID \n }" > ./app/version.gradle
+  - echo -e "ext { appVersionCode = ${CI_PIPELINE_ID} }" > ./app/version.gradle
   - echo -e "systemProp.http.proxyHost=192.168.3.8\n systemProp.http.proxyPort=1080\n systemProp.https.proxyHost=192.168.3.8\n systemProp.https.proxyPort=1080\n org.gradle.jvmargs=-Xmx1536m\n org.gradle.parallel=true" >> gradle.properties
   - export GRADLE_USER_HOME=$(pwd)/.gradle
   - chmod +x ./gradlew

app/build.gradle

@@ -1,12 +1,13 @@
 apply plugin: 'com.android.application'
 apply from: 'version.gradle'
 android {
-    compileSdkVersion 'android-P'
-    buildToolsVersion '28.0.0 rc2'
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId 'org.SilverBlog.client'
         minSdkVersion 21
         targetSdkVersion 27
+        versionCode appVersionCode
         versionName "1.0.0"
     }
     signingConfigs {
@@ -29,10 +30,10 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:28+'
-    implementation 'com.android.support:design:28+'
-    implementation 'com.android.support:cardview-v7:28+'
-    implementation 'com.android.support:recyclerview-v7:28+'
+    implementation 'com.android.support:appcompat-v7:27+'
+    implementation 'com.android.support:design:27+'
+    implementation 'com.android.support:cardview-v7:27+'
+    implementation 'com.android.support:recyclerview-v7:27+'
     //noinspection GradleDynamicVersion
     implementation 'com.google.zxing:core:+'
     //noinspection GradleDynamicVersion