Skip to content

Commit 655d0e9

Browse files
author
ghc
committed
merge master_dev to master with no-ff
2 parents 001739f + ca6ed2a commit 655d0e9

25 files changed

Lines changed: 391 additions & 279 deletions

‎EvolvingBase/EvolvingBase.iml‎

Lines changed: 45 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,35 @@
2828
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2929
<exclude-output />
3030
<content url="file://$MODULE_DIR$">
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3132
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3233
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3334
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3435
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
3839
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3940
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4041
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4142
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4343
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4444
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
4546
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4647
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4748
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4849
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4950
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5051
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
5152
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
5260
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5361
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5462
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
@@ -77,45 +85,51 @@
7785
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
7886
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7987
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
8390
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8491
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
8694
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8795
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
88100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
89102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
90104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
91105
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
92106
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
93107
</content>
94-
<orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
108+
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
95109
<orderEntry type="sourceFolder" forTests="false" />
96-
<orderEntry type="library" exported="" name="Gradle: com.android.support:support-annotations:26.0.2@jar" level="project" />
97-
<orderEntry type="library" exported="" name="Gradle: android.arch.core:common:1.0.0-alpha9@jar" level="project" />
98-
<orderEntry type="library" exported="" name="Gradle: com.android.support:preference-v7-26.0.2" level="project" />
99-
<orderEntry type="library" exported="" name="Gradle: com.android.support:recyclerview-v7-26.0.2" level="project" />
100-
<orderEntry type="library" exported="" name="Gradle: com.trello.rxlifecycle2:rxlifecycle-components-2.2.0" level="project" />
101-
<orderEntry type="library" exported="" name="Gradle: com.trello.rxlifecycle2:rxlifecycle-android-lifecycle-2.2.0" level="project" />
102-
<orderEntry type="library" exported="" name="Gradle: cn.bingoogolapple:bga-swipebacklayout-1.1.9" level="project" />
103-
<orderEntry type="library" exported="" name="Gradle: io.reactivex.rxjava2:rxandroid-2.0.1" level="project" />
104-
<orderEntry type="library" exported="" name="Gradle: com.android.support:animated-vector-drawable-26.0.2" level="project" />
105-
<orderEntry type="library" exported="" name="Gradle: com.trello.rxlifecycle2:rxlifecycle:2.2.0@jar" level="project" />
106-
<orderEntry type="library" exported="" name="Gradle: io.reactivex.rxjava2:rxjava:2.1.3@jar" level="project" />
107-
<orderEntry type="library" exported="" name="Gradle: com.trello.rxlifecycle2:rxlifecycle-android-2.2.0" level="project" />
108-
<orderEntry type="library" exported="" name="Gradle: com.android.support:support-core-ui-26.0.2" level="project" />
109-
<orderEntry type="library" exported="" name="Gradle: com.android.support:support-vector-drawable-26.0.2" level="project" />
110-
<orderEntry type="library" exported="" name="Gradle: com.android.support:support-core-utils-26.0.2" level="project" />
111-
<orderEntry type="library" exported="" name="Gradle: com.android.support:support-fragment-26.0.2" level="project" />
112-
<orderEntry type="library" exported="" name="Gradle: android.arch.lifecycle:common:1.0.0-alpha9@jar" level="project" />
113-
<orderEntry type="library" exported="" name="Gradle: com.trello.rxlifecycle2:rxlifecycle-components-preference-2.2.0" level="project" />
114-
<orderEntry type="library" exported="" name="Gradle: com.android.support:support-media-compat-26.0.2" level="project" />
115-
<orderEntry type="library" exported="" name="Gradle: com.android.support:support-v4-26.0.2" level="project" />
116-
<orderEntry type="library" exported="" name="Gradle: com.android.support:support-compat-26.0.2" level="project" />
117-
<orderEntry type="library" exported="" name="Gradle: org.reactivestreams:reactive-streams:1.0.1@jar" level="project" />
118-
<orderEntry type="library" exported="" name="Gradle: android.arch.lifecycle:runtime-1.0.0-alpha9" level="project" />
119-
<orderEntry type="library" exported="" name="Gradle: com.android.support:appcompat-v7-26.0.2" level="project" />
110+
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:26.0.2@jar" level="project" />
111+
<orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0-alpha9@jar" level="project" />
112+
<orderEntry type="library" name="Gradle: com.android.support:preference-v7-26.0.2" level="project" />
113+
<orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-26.0.2" level="project" />
114+
<orderEntry type="library" name="Gradle: com.trello.rxlifecycle2:rxlifecycle-components-2.2.0" level="project" />
115+
<orderEntry type="library" name="Gradle: com.trello.rxlifecycle2:rxlifecycle-android-lifecycle-2.2.0" level="project" />
116+
<orderEntry type="library" name="Gradle: cn.bingoogolapple:bga-swipebacklayout-1.1.9" level="project" />
117+
<orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxandroid-2.0.1" level="project" />
118+
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-26.0.2" level="project" />
119+
<orderEntry type="library" name="Gradle: com.trello.rxlifecycle2:rxlifecycle:2.2.0@jar" level="project" />
120+
<orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxjava:2.1.3@jar" level="project" />
121+
<orderEntry type="library" name="Gradle: com.trello.rxlifecycle2:rxlifecycle-android-2.2.0" level="project" />
122+
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-26.0.2" level="project" />
123+
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-26.0.2" level="project" />
124+
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-26.0.2" level="project" />
125+
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-26.0.2" level="project" />
126+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.0.0-alpha9@jar" level="project" />
127+
<orderEntry type="library" name="Gradle: com.trello.rxlifecycle2:rxlifecycle-components-preference-2.2.0" level="project" />
128+
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat-26.0.2" level="project" />
129+
<orderEntry type="library" name="Gradle: com.android.support:support-v4-26.0.2" level="project" />
130+
<orderEntry type="library" name="Gradle: com.android.support:support-compat-26.0.2" level="project" />
131+
<orderEntry type="library" name="Gradle: org.reactivestreams:reactive-streams:1.0.1@jar" level="project" />
132+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.0.0-alpha9" level="project" />
133+
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-26.0.2" level="project" />
120134
</component>
121135
</module>

‎EvolvingBase/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ apply plugin: 'com.github.dcendents.android-maven'
44
group = 'com.github.CodingCodersCode'
55

66
android {
7-
compileSdkVersion 26
8-
buildToolsVersion "26.0.1"
7+
compileSdkVersion 27
8+
buildToolsVersion "27.0.3"
99

1010
defaultConfig {
1111
minSdkVersion 14
12-
targetSdkVersion 26
12+
targetSdkVersion 27
1313
versionCode 1
1414
versionName "1.0"
1515

0 commit comments

Comments
 (0)