diff options
author | Andrew Dolgov <[email protected]> | 2018-07-10 16:49:39 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2018-07-10 16:49:39 +0300 |
commit | 18db184539d0b9200d7fdb9b45130ed4f5bdacc7 (patch) | |
tree | 57098fb40c6bc137355ea2e5e544cd812a699d08 /org.fox.ttcomics | |
parent | b18a22095e094e4a5eb87cbeb48b807dfe19ac77 (diff) |
update gradle, bump SDK stuff
Diffstat (limited to 'org.fox.ttcomics')
-rwxr-xr-x | org.fox.ttcomics/build.gradle | 14 | ||||
-rwxr-xr-x | org.fox.ttcomics/org.fox.ttcomics.iml | 96 |
2 files changed, 56 insertions, 54 deletions
diff --git a/org.fox.ttcomics/build.gradle b/org.fox.ttcomics/build.gradle index 70ec6c2..859c49e 100755 --- a/org.fox.ttcomics/build.gradle +++ b/org.fox.ttcomics/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application'
android {
- compileSdkVersion 25
- buildToolsVersion "25.0.3"
+ compileSdkVersion 27
+ buildToolsVersion "27.0.3"
defaultConfig {
applicationId "org.fox.ttcomics2"
minSdkVersion 19
- targetSdkVersion 23
+ targetSdkVersion 27
}
signingConfigs {
@@ -46,10 +46,10 @@ android { }
dependencies {
- compile 'com.android.support:support-v4:25.3.1'
- compile 'com.android.support:appcompat-v7:25.3.1'
- compile 'com.android.support:cardview-v7:25.3.1'
- compile 'com.shamanland:fab:0.0.5'
+ compile 'com.android.support:support-v4:27.1.0'
+ compile 'com.android.support:appcompat-v7:27.1.0'
+ compile 'com.android.support:cardview-v7:27.1.0'
+ compile 'com.shamanland:fab:0.0.8'
compile 'jp.co.recruit_mp:android-HeaderFooterGridView:0.2.4'
compile files('libs/universal-image-loader-1.9.3.jar')
compile 'ch.acra:acra:4.9.1'
diff --git a/org.fox.ttcomics/org.fox.ttcomics.iml b/org.fox.ttcomics/org.fox.ttcomics.iml index 7fcadaa..c1d4932 100755 --- a/org.fox.ttcomics/org.fox.ttcomics.iml +++ b/org.fox.ttcomics/org.fox.ttcomics.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id=":org.fox.ttcomics" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="tt-comics" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> +<module external.linked.project.id=":org.fox.ttcomics" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="android-gradle" name="Android-Gradle"> <configuration> @@ -22,25 +22,26 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7"> <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" /> <exclude-output /> <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" /> @@ -48,6 +49,13 @@ <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" /> @@ -62,13 +70,6 @@ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" /> @@ -76,50 +77,51 @@ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> - <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> </content> - <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" /> + <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" exported="" name="nineoldandroids-2.4.0" level="project" /> - <orderEntry type="library" exported="" name="universal-image-loader-1.9.3" level="project" /> - <orderEntry type="library" exported="" name="android-HeaderFooterGridView-0.2.4" level="project" /> - <orderEntry type="library" exported="" name="fab-0.0.5" level="project" /> - <orderEntry type="library" exported="" name="acra-4.9.1" level="project" /> - <orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" /> - <orderEntry type="library" exported="" name="cardview-v7-25.3.1" level="project" /> - <orderEntry type="library" exported="" name="lib-core-3.1.0" level="project" /> - <orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" /> - <orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" /> - <orderEntry type="library" exported="" name="view-pager-transforms-1.2.32" level="project" /> - <orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" /> - <orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" /> - <orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" /> - <orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" /> - <orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" /> - <orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" /> - <orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" /> + <orderEntry type="library" name="com.android.support:animated-vector-drawable-27.1.0" level="project" /> + <orderEntry type="library" name="__local_aars__:C.\cygwin64\home\fox\Projects\tt-comics\org.fox.ttcomics\libs\nineoldandroids-2.4.0.jar:unspecified@jar" level="project" /> + <orderEntry type="library" name="android.arch.lifecycle:common:1.1.0@jar" level="project" /> + <orderEntry type="library" name="com.android.support:appcompat-v7-27.1.0" level="project" /> + <orderEntry type="library" name="com.android.support:cardview-v7-27.1.0" level="project" /> + <orderEntry type="library" name="jp.co.recruit_mp:android-HeaderFooterGridView-0.2.4" level="project" /> + <orderEntry type="library" name="com.android.support:support-compat-27.1.0" level="project" /> + <orderEntry type="library" name="com.android.support:support-core-utils-27.1.0" level="project" /> + <orderEntry type="library" name="android.arch.core:common:1.1.0@jar" level="project" /> + <orderEntry type="library" name="android.arch.lifecycle:viewmodel-1.1.0" level="project" /> + <orderEntry type="library" name="com.android.support:support-core-ui-27.1.0" level="project" /> + <orderEntry type="library" name="ch.acra:acra-4.9.1" level="project" /> + <orderEntry type="library" name="com.android.support:support-annotations:27.1.0@jar" level="project" /> + <orderEntry type="library" name="com.ToxicBakery.viewpager.transforms:view-pager-transforms-1.2.32" level="project" /> + <orderEntry type="library" name="android.arch.lifecycle:livedata-core-1.1.0" level="project" /> + <orderEntry type="library" name="__local_aars__:C.\cygwin64\home\fox\Projects\tt-comics\org.fox.ttcomics\libs\universal-image-loader-1.9.3.jar:unspecified@jar" level="project" /> + <orderEntry type="library" name="com.android.support:support-media-compat-27.1.0" level="project" /> + <orderEntry type="library" name="com.android.support:support-fragment-27.1.0" level="project" /> + <orderEntry type="library" name="com.nhaarman.listviewanimations:lib-core-3.1.0" level="project" /> + <orderEntry type="library" name="com.shamanland:fab-0.0.8" level="project" /> + <orderEntry type="library" name="com.android.support:support-v4-27.1.0" level="project" /> + <orderEntry type="library" name="android.arch.lifecycle:runtime-1.1.0" level="project" /> + <orderEntry type="library" name="com.android.support:support-vector-drawable-27.1.0" level="project" /> + <orderEntry type="library" name="android.arch.core:runtime-1.1.0" level="project" /> </component> </module>
\ No newline at end of file |