Browse Source

bump version

Andrew Dolgov 6 months ago
parent
commit
08da193c16
4 changed files with 60 additions and 70 deletions
  1. 2 2
      build.gradle
  2. 55 65
      org.fox.ttcomics/org.fox.ttcomics.iml
  3. 2 2
      org.fox.ttcomics/src/main/AndroidManifest.xml
  4. 1 1
      tt-comics.iml

+ 2 - 2
build.gradle

@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
@@ -11,8 +11,8 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
         google()
+        jcenter()
         maven { url "https://jitpack.io" }
         maven { url 'http://guardian.github.com/maven/repo-releases' }
     }

+ 55 - 65
org.fox.ttcomics/org.fox.ttcomics.iml

@@ -49,13 +49,6 @@
       <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" />
@@ -63,6 +56,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" 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/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/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -86,82 +86,72 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/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/build-info" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <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-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/javaPrecompile" />
       <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/prebuild" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <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/tmp" />
       <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 27 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="com.android.support:animated-vector-drawable-27.1.0" level="project" />
-    <orderEntry type="library" name="frankiesardo:icepick:[email protected]" level="project" />
-    <orderEntry type="library" name="com.android.support:appcompat-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:design-27.1.0" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-base-15.0.1" level="project" />
-    <orderEntry type="library" name="frankiesardo:icepick-processor:[email protected]" level="project" />
-    <orderEntry type="library" name="com.android.support:transition-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:[email protected]" level="project" />
-    <orderEntry type="library" name="ch.acra:acra-4.9.1" level="project" />
-    <orderEntry type="library" name="com.android.support:support-annotations:[email protected]" level="project" />
-    <orderEntry type="library" name="scout:scout:0.1[email protected]" level="project" />
-    <orderEntry type="library" name="com.ToxicBakery.viewpager.transforms:view-pager-transforms-1.2.32" level="project" />
-    <orderEntry type="library" name="com.android.support:recyclerview-v7-27.1.0" level="project" />
-    <orderEntry type="library" name="org.clojure:clojure:[email protected]" level="project" />
-    <orderEntry type="library" name="com.google.auto.service:auto-service:[email protected]" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-auth-base-15.0.1" level="project" />
-    <orderEntry type="library" name="com.github.bumptech.glide:glide:[email protected]" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-auth-api-phone-15.0.1" level="project" />
-    <orderEntry type="library" name="stencil:stencil:[email protected]" level="project" />
-    <orderEntry type="library" name="com.google.guava:guava:[email protected]" level="project" />
-    <orderEntry type="library" name="org.clojure:core.cache:0.6.3@jar" level="project" />
-    <orderEntry type="library" name="com.nhaarman.listviewanimations:lib-core-3.1.0" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-basement-15.0.1" level="project" />
-    <orderEntry type="library" name="com.android.support:support-vector-drawable-27.1.0" level="project" />
-    <orderEntry type="library" name="android.arch.lifecycle:runtime-1.1.0" level="project" />
-    <orderEntry type="library" name="net.rdrei.android.dirchooser:library-3.2" 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:[email protected]" level="project" />
-    <orderEntry type="library" name="com.android.support:cardview-v7-27.1.0" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-tasks-15.0.1" level="project" />
-    <orderEntry type="library" name="com.android.support:support-compat-27.1.0" level="project" />
-    <orderEntry type="library" name="slingshot:slingshot:0.10[email protected]" 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="com.github.livefront:bridge-v1.1.2" level="project" />
-    <orderEntry type="library" name="com.google.auto:auto-common:0[email protected]" level="project" />
-    <orderEntry type="library" name="android.arch.lifecycle:livedata-core-1.1.0" level="project" />
-    <orderEntry type="library" name="com.gu:option:[email protected]" level="project" />
-    <orderEntry type="library" name="com.android.support:support-media-compat-27.1.0" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-auth-15.0.1" level="project" />
-    <orderEntry type="library" name="com.android.support:support-fragment-27.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.core:runtime-1.1.0" level="project" />
-    <orderEntry type="library" name="quoin:quoin:0.1.2@jar" level="project" />
-    <orderEntry type="library" name="org.clojure:data.priority-map:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:transition-27.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.ToxicBakery.viewpager.transforms:view-pager-transforms-1.2.32" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.service:auto-service:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: stencil:stencil:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.guava:guava:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: org.clojure:data.priority-map:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: net.rdrei.android.dirchooser:library-3.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-api-phone-15.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement-15.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-base-15.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:cardview-v7-27.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: frankiesardo:icepick:3.2[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: scout:scout:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-15.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-v4-27.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-27.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base-15.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: frankiesardo:icepick-processor:3.2.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat-27.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.acra:acra-4.9.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.shamanland:fab-0.0.8" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto:auto-common:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.livefront:bridge-v1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: jp.co.recruit_mp:android-HeaderFooterGridView-0.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.gu:option:1[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: quoin:quoin:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:/home/fox/Projects/tt-comics/org.fox.ttcomics/libs/nineoldandroids-2.4.0.jar:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.nhaarman.listviewanimations:lib-core-3.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.clojure:core.cache:0.6[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:design-27.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: slingshot:slingshot:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks-15.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.clojure:clojure:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.0" level="project" />
   </component>
 </module>

+ 2 - 2
org.fox.ttcomics/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttcomics2"
-    android:versionCode="82"
-    android:versionName="1.40" >
+    android:versionCode="83"
+    android:versionName="1.41" >
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />

+ 1 - 1
tt-comics.iml

@@ -13,7 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>