diff options
author | Andrew Dolgov <[email protected]> | 2017-05-31 08:12:02 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2017-05-31 08:12:02 +0300 |
commit | a7b70c52702289439e280dff760346e2c19dbed4 (patch) | |
tree | 6ffc4659090aee3d7388499928ddc9b3f283b7a1 /org.fox.ttcomics | |
parent | ec7cf3d0046b550f994ce46bc42d732792a83b09 (diff) |
update libraries, etc
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 | 49 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java | 4 |
3 files changed, 37 insertions, 30 deletions
diff --git a/org.fox.ttcomics/build.gradle b/org.fox.ttcomics/build.gradle index 7514450..6e3f0b3 100755 --- a/org.fox.ttcomics/build.gradle +++ b/org.fox.ttcomics/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.application'
android {
- compileSdkVersion 23
- buildToolsVersion "23.0.2"
+ compileSdkVersion 25
+ buildToolsVersion "25.0.3"
defaultConfig {
applicationId "org.fox.ttcomics2"
@@ -11,7 +11,7 @@ android { }
lintOptions {
- abortOnError false
+ abortOnError false
checkReleaseBuilds false
disable 'MissingTranslation'
}
@@ -25,14 +25,14 @@ android { }
dependencies {
- compile 'com.android.support:support-v4:23.1.1'
- compile 'com.android.support:appcompat-v7:23.1.1'
- compile 'com.android.support:cardview-v7:23.1.1'
+ 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 'it.neokree:MaterialTabs:0.11'
compile 'com.shamanland:fab:0.0.5'
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.5.0'
+ compile 'ch.acra:acra:4.9.1'
compile 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar'
compile 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'
compile files('libs/nineoldandroids-2.4.0.jar')
diff --git a/org.fox.ttcomics/org.fox.ttcomics.iml b/org.fox.ttcomics/org.fox.ttcomics.iml index 971f5d5..7e5b8f3 100755 --- a/org.fox.ttcomics/org.fox.ttcomics.iml +++ b/org.fox.ttcomics/org.fox.ttcomics.iml @@ -9,7 +9,6 @@ <facet type="android" name="Android"> <configuration> <option name="SELECTED_BUILD_VARIANT" value="debug" /> - <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" /> <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> <afterSyncTasks> @@ -47,7 +46,6 @@ <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" 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/testDebug/res" type="java-test-resource" /> @@ -55,7 +53,6 @@ <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" /> @@ -63,7 +60,6 @@ <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/jni" 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" /> @@ -71,7 +67,6 @@ <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/jni" 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" /> @@ -79,40 +74,52 @@ <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/jni" 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" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.ToxicBakery.viewpager.transforms/view-pager-transforms/1.2.32/jars" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.1.1/jars" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.markushi/android-ui/1.2/jars" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.nhaarman.listviewanimations/lib-core/3.1.0/jars" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.shamanland/fab/0.0.5/jars" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/it.neokree/MaterialTabs/0.11/jars" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/jp.co.recruit_mp/android-HeaderFooterGridView/0.2.4/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" /> <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/manifests" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" /> <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/symbols" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> + <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> </content> - <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" /> + <orderEntry type="jdk" jdkName="Android API 25 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="acra-4.5.0" level="project" /> - <orderEntry type="library" exported="" name="cardview-v7-23.1.1" 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-23.1.1" 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="android-ui-1.2" level="project" /> <orderEntry type="library" exported="" name="view-pager-transforms-1.2.32" level="project" /> - <orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" /> - <orderEntry type="library" exported="" name="appcompat-v7-23.1.1" 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" exported="" name="MaterialTabs-0.11" level="project" /> </component> </module>
\ No newline at end of file diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java index 7ba041b..535d87f 100644 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java @@ -4,10 +4,10 @@ import org.acra.ACRA; import org.acra.ReportingInteractionMode; import org.acra.annotation.ReportsCrashes; -@ReportsCrashes(formKey = "", mode = ReportingInteractionMode.DIALOG, +@ReportsCrashes(mode = ReportingInteractionMode.SILENT, excludeMatchingSharedPreferencesKeys = {"password"}, resDialogText = R.string.crash_dialog_text, - formUri = "http://tt-rss.org/acra/submit/") + formUri = "https://tt-rss.org/acra/submit/") public class Application extends android.app.Application { @Override public final void onCreate() { |