Skip to content

Commit 3547ec7

Browse files
author
陈超
committed
Accept Merge Request #38: (ci -> master)
Merge Request: 创建 ci Created By: @陈超 Accepted By: @陈超 URL: https://codingcorp.coding.net/p/Enterprise-Android/git/merge/38
2 parents e5c2887 + 5891d5b commit 3547ec7

9 files changed

Lines changed: 38 additions & 11 deletions

File tree

‎.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,9 @@ app/manifest-merger-release-report.txt
4444
app/src/main/java/net/coding/program/network/model/baidumap/
4545

4646
/.gradle/
47+
/gradle
48+
49+
!/coding.jks
50+
!/local.properties
51+
/gradle.properties
52+
/coding.jks

‎app/build.gradle‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@ android {
6161
versionName "5.4"
6262
targetSdkVersion 23
6363

64-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
64+
manifestPlaceholders = [
65+
XG_ACCESS_ID : "0",
66+
XG_ACCESS_KEY: "0",
67+
]
6568
signingConfig signingConfigs.config
6669
}
6770
enterprise {
@@ -143,12 +146,12 @@ dependencies {
143146
// dagger 2 依赖
144147
def daggerVersion = '2.10'
145148
implementation "com.google.dagger:dagger:$daggerVersion"
146-
annotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
149+
kapt "com.google.dagger:dagger-compiler:$daggerVersion"
147150
implementation "com.google.dagger:dagger-android:$daggerVersion"
148151
implementation "com.google.dagger:dagger-android-support:$daggerVersion"
149152

150153
// if you use the support libraries
151-
annotationProcessor "com.google.dagger:dagger-android-processor:$daggerVersion"
154+
kapt "com.google.dagger:dagger-android-processor:$daggerVersion"
152155

153156
configurations {
154157
all*.exclude group: 'com.android.support', module: 'support-v13'

‎ci.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
cur_dir=$(cd $(dirname $0); pwd)
2+
docker_src=/home/data
3+
4+
docker rm ci2
5+
docker run --mount type=bind,source=$cur_dir,target=$docker_src -it --name ci2 android-ci:v2 \
6+
bash -c "cd ${docker_src} && export PATH=$PATH:/opt/gradle/gradle-4.4/bin && gradle wrapper && ./gradlew assembleRelease"
7+

‎ci/Dockerfile‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
FROM javiersantos/android-ci:27.0.3
2+
LABEL maintainer="Coding Android"
3+
4+
RUN curl -L https://services.gradle.org/distributions/gradle-4.4-bin.zip > /gradle.zip && \
5+
mkdir /opt/gradle && \
6+
unzip /gradle.zip -d /opt/gradle && \
7+
export PATH=$PATH:/opt/gradle/gradle-4.4/bin && \
8+
rm -rf /gradle.zip
9+
10+
11+

‎common-coding/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
3+
apply plugin: "kotlin-kapt"
34

45
android {
56
compileSdkVersion 27
@@ -38,7 +39,7 @@ android {
3839
}
3940

4041
dependencies {
41-
annotationProcessor "org.androidannotations:androidannotations:$AAVersion"
42+
kapt "org.androidannotations:androidannotations:$AAVersion"
4243
api "org.androidannotations:androidannotations-api:$AAVersion"
4344

4445
configurations {

‎common-third-library/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ dependencies {
3434
api "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlinVersion"
3535

3636
// 测试框架
37-
implementation "com.android.support:support-annotations:$supportVersion"
38-
androidTestImplementation "com.android.support.test:runner:$runnerVersion"
39-
androidTestImplementation "com.android.support.test:rules:$rulesVersion"
40-
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion"
37+
api "com.android.support:support-annotations:$supportVersion"
38+
api "com.android.support.test:runner:$runnerVersion"
39+
api "com.android.support.test:rules:$rulesVersion"
40+
api "com.android.support.test.espresso:espresso-core:$espressoVersion"
4141

4242

4343
api "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlinVersion"

‎gradle/wrapper/gradle-wrapper.jar‎

2.91 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Tue Mar 27 09:18:52 CST 2018
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
zipStoreBase=GRADLE_USER_HOME
54
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip

‎widget-pick-photo/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ allOpen {
5959
dependencies {
6060
// 生成 R2
6161
implementation 'com.jakewharton:butterknife:8.8.1'
62-
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
62+
kapt 'com.jakewharton:butterknife-compiler:8.8.1'
6363

6464
kapt "org.androidannotations:androidannotations:$AAVersion"
6565

0 commit comments

Comments
 (0)