Accept Merge Request #38: (ci -> master)

Merge Request: 创建 ci
Created By: @陈超
Accepted By: @陈超
URL: https://codingcorp.coding.net/p/Enterprise-Android/git/merge/38

Author: 陈超

.gitignore

@@ -44,3 +44,9 @@ app/manifest-merger-release-report.txt
 app/src/main/java/net/coding/program/network/model/baidumap/
 
 /.gradle/
+/gradle
+
+!/coding.jks
+!/local.properties
+/gradle.properties
+/coding.jks

app/build.gradle

@@ -61,7 +61,10 @@ android {
             versionName "5.4"
             targetSdkVersion 23
 
-            testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+            manifestPlaceholders = [
+                    XG_ACCESS_ID : "0",
+                    XG_ACCESS_KEY: "0",
+            ]
             signingConfig signingConfigs.config
         }
         enterprise {
@@ -143,12 +146,12 @@ dependencies {
     // dagger 2 依赖
     def daggerVersion = '2.10'
     implementation "com.google.dagger:dagger:$daggerVersion"
-    annotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
+    kapt "com.google.dagger:dagger-compiler:$daggerVersion"
     implementation "com.google.dagger:dagger-android:$daggerVersion"
     implementation "com.google.dagger:dagger-android-support:$daggerVersion"
 
     // if you use the support libraries
-    annotationProcessor "com.google.dagger:dagger-android-processor:$daggerVersion"
+    kapt "com.google.dagger:dagger-android-processor:$daggerVersion"
 
     configurations {
         all*.exclude group: 'com.android.support', module: 'support-v13'

ci.sh

@@ -0,0 +1,7 @@
+cur_dir=$(cd $(dirname $0); pwd)
+docker_src=/home/data
+
+docker rm ci2
+docker run --mount type=bind,source=$cur_dir,target=$docker_src -it --name ci2 android-ci:v2 \
+	bash -c "cd ${docker_src} && export PATH=$PATH:/opt/gradle/gradle-4.4/bin && gradle wrapper && ./gradlew assembleRelease"
+

ci/Dockerfile

@@ -0,0 +1,11 @@
+FROM javiersantos/android-ci:27.0.3
+LABEL maintainer="Coding Android"
+
+RUN curl -L https://services.gradle.org/distributions/gradle-4.4-bin.zip > /gradle.zip && \
+	mkdir /opt/gradle && \
+	unzip /gradle.zip -d /opt/gradle && \
+	export PATH=$PATH:/opt/gradle/gradle-4.4/bin && \
+	rm -rf /gradle.zip
+	
+
+

common-coding/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: "kotlin-kapt"
 
 android {
     compileSdkVersion 27
@@ -38,7 +39,7 @@ android {
 }
 
 dependencies {
-    annotationProcessor "org.androidannotations:androidannotations:$AAVersion"
+    kapt "org.androidannotations:androidannotations:$AAVersion"
     api "org.androidannotations:androidannotations-api:$AAVersion"
 
     configurations {

common-third-library/build.gradle

@@ -34,10 +34,10 @@ dependencies {
     api "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlinVersion"
 
     // 测试框架
-    implementation "com.android.support:support-annotations:$supportVersion"
-    androidTestImplementation "com.android.support.test:runner:$runnerVersion"
-    androidTestImplementation "com.android.support.test:rules:$rulesVersion"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion"
+    api "com.android.support:support-annotations:$supportVersion"
+    api "com.android.support.test:runner:$runnerVersion"
+    api "com.android.support.test:rules:$rulesVersion"
+    api "com.android.support.test.espresso:espresso-core:$espressoVersion"
 
 
     api "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlinVersion"

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Tue Mar 27 09:18:52 CST 2018
 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.4-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -59,7 +59,7 @@ allOpen {
 dependencies {
     // 生成 R2
     implementation 'com.jakewharton:butterknife:8.8.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+    kapt 'com.jakewharton:butterknife-compiler:8.8.1'
 
     kapt "org.androidannotations:androidannotations:$AAVersion"