Skip to content

Commit 10257ab

Browse files
author
TR4Android
authored
Merge pull request #29 from TR4Android/development
Update from development
2 parents 58f1f66 + bd02fd8 commit 10257ab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+632
-389
lines changed

‎.idea/.name‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.idea/gradle.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 1 addition & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AppCompat-Extension-Library.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1515
</content>
16-
<orderEntry type="inheritedJdk" />
16+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
</component>
1919
</module>

‎app/app.iml‎

Lines changed: 46 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<facet type="android" name="Android">
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1312
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1413
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1514
<afterSyncTasks>
@@ -23,101 +22,118 @@
2322
</configuration>
2423
</facet>
2524
</component>
26-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
25+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
2726
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
2827
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2928
<exclude-output />
3029
<content url="file://$MODULE_DIR$">
30+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3131
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3434
<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" />
3635
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3736
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4141
<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" />
4342
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4443
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
4545
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4646
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4747
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4848
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4949
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
50-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5150
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
5251
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
5359
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5460
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5561
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5662
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5763
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
58-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
5964
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
6065
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
6166
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
6267
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
6368
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6469
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
6570
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6771
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6872
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
6973
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7074
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7175
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
7276
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
7377
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
7578
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7679
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7780
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7881
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7982
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
8083
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
8184
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
82-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8385
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8486
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8587
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8688
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
8891
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/24.2.1/jars" />
9192
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
9397
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
9499
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
95101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
97104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
98105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
99106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
100109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
110+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
101111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
102112
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
103113
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
104114
</content>
105-
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
115+
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
106116
<orderEntry type="sourceFolder" forTests="false" />
107-
<orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" />
108-
<orderEntry type="library" exported="" name="cardview-v7-24.2.1" level="project" />
109-
<orderEntry type="module" module-name="appcompat-extension" exported="" />
110-
<orderEntry type="library" exported="" name="android-android-24" level="project" />
111-
<orderEntry type="library" exported="" name="support-v4-24.2.1" level="project" />
112-
<orderEntry type="library" exported="" name="support-compat-24.2.1" level="project" />
113-
<orderEntry type="library" exported="" name="support-media-compat-24.2.1" level="project" />
114-
<orderEntry type="library" exported="" name="animated-vector-drawable-24.2.1" level="project" />
115-
<orderEntry type="library" exported="" name="support-fragment-24.2.1" level="project" />
116-
<orderEntry type="library" exported="" name="support-core-ui-24.2.1" level="project" />
117-
<orderEntry type="library" exported="" name="recyclerview-v7-24.2.1" level="project" />
118-
<orderEntry type="library" exported="" name="appcompat-v7-24.2.1" level="project" />
119-
<orderEntry type="library" exported="" name="support-vector-drawable-24.2.1" level="project" />
120-
<orderEntry type="library" exported="" name="support-core-utils-24.2.1" level="project" />
121-
<orderEntry type="library" exported="" name="design-24.2.1" level="project" />
117+
<orderEntry type="library" name="com.android.support:animated-vector-drawable-27.1.0" level="project" />
118+
<orderEntry type="library" name="android.arch.lifecycle:common:1.1.0@jar" level="project" />
119+
<orderEntry type="library" name="com.android.support:appcompat-v7-27.1.0" level="project" />
120+
<orderEntry type="library" name="com.android.support:cardview-v7-27.1.0" level="project" />
121+
<orderEntry type="library" name="com.android.support:design-27.1.0" level="project" />
122+
<orderEntry type="library" name="com.android.support:support-compat-27.1.0" level="project" />
123+
<orderEntry type="library" name="com.android.support:transition-27.1.0" level="project" />
124+
<orderEntry type="library" name="com.android.support:support-core-utils-27.1.0" level="project" />
125+
<orderEntry type="library" name="android.arch.core:common:1.1.0@jar" level="project" />
126+
<orderEntry type="library" name="android.arch.lifecycle:viewmodel-1.1.0" level="project" />
127+
<orderEntry type="library" name="com.android.support:support-core-ui-27.1.0" level="project" />
128+
<orderEntry type="library" name="com.android.support:support-annotations:27.1.0@jar" level="project" />
129+
<orderEntry type="library" name="com.android.support:recyclerview-v7-27.1.0" level="project" />
130+
<orderEntry type="library" name="android.arch.lifecycle:livedata-core-1.1.0" level="project" />
131+
<orderEntry type="library" name="com.android.support:support-media-compat-27.1.0" level="project" />
132+
<orderEntry type="library" name="com.android.support:support-fragment-27.1.0" level="project" />
133+
<orderEntry type="library" name="com.android.support:support-v4-27.1.0" level="project" />
134+
<orderEntry type="library" name="android.arch.lifecycle:runtime-1.1.0" level="project" />
135+
<orderEntry type="library" name="com.android.support:support-vector-drawable-27.1.0" level="project" />
136+
<orderEntry type="library" name="android.arch.core:runtime-1.1.0" level="project" />
137+
<orderEntry type="module" module-name="appcompat-extension" />
122138
</component>
123139
</module>

‎app/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 24
5-
buildToolsVersion "24.0.1"
4+
compileSdkVersion 27
5+
buildToolsVersion "26.0.2"
66

77
defaultConfig {
88
vectorDrawables.useSupportLibrary = true
99
applicationId "com.tr4android.appcompatextension"
10-
minSdkVersion 9
11-
targetSdkVersion 24
10+
minSdkVersion 14
11+
targetSdkVersion 27
1212
versionCode 1
1313
versionName "1.0"
1414
}
@@ -23,5 +23,5 @@ android {
2323
dependencies {
2424
compile fileTree(dir: 'libs', include: ['*.jar'])
2525
compile project(':appcompat-extension')
26-
compile 'com.android.support:cardview-v7:24.2.1'
26+
compile 'com.android.support:cardview-v7:27.+'
2727
}

0 commit comments

Comments
 (0)