Browse Source

update gradle

Andrew Dolgov 8 months ago
parent
commit
5466c7f053
3 changed files with 53 additions and 93 deletions
  1. 1 1
      build.gradle
  2. 2 2
      gradle/wrapper/gradle-wrapper.properties
  3. 50 90
      org.fox.ttirc/org.fox.ttirc.iml

+ 1 - 1
build.gradle

@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.5.2'
     }
 }
 

+ 2 - 2
gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Mar 10 11:15:20 MSK 2019
+#Thu Nov 28 19:29:41 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

+ 50 - 90
org.fox.ttirc/org.fox.ttirc.iml

@@ -4,6 +4,8 @@
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":org.fox.ttirc" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.3.0" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.3.0" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
@@ -32,14 +34,14 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" 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/renderscript_source_output_dir/debug/compileDebugRenderscript/out" 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/res/rs/debug" type="java-resource" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" 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/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" 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/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
       <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" />
@@ -69,13 +71,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/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" />
-      <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/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <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" />
@@ -83,98 +78,63 @@
       <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/generated/not_namespaced_r_class_sources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
-      <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/bundle_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/external_libs_dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <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-apk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_app_info_output_file" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_main_apk_resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/metadata_feature_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
-      <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" />
+      <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" />
+      <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/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: commons-io:commons-io:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: commons-codec:commons-codec:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.james:apache-mime4j-examples:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:[email protected]" 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: com.android.support:support-core-utils:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: org.clojure:data.priority-map:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:customtabs:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: frankiesardo:icepick:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: scout:scout:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-v4:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:runtime:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: frankiesardo:icepick-processor:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:[email protected]ar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.auto:auto-common:0.3@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.livefront:bridge:[email protected]ar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: frankiesardo:icepick:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpmime:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: quoin:quoin:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.james:apache-mime4j-dom:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpcore:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: stencil:stencil:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: scout:scout:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: quoin:quoin:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: slingshot:slingshot:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: org.clojure:core.cache:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: org.clojure:data.priority-map:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: org.clojure:clojure:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.service:auto-service:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.james:apache-mime4j-examples:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.james:apache-mime4j-benchmark:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: commons-logging:commons-logging:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-compat:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: slingshot:slingshot:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.viewpagerindicator:library:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-fragment:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: commons-codec:commons-codec:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.james:apache-mime4j-storage:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: org.clojure:clojure:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.james:apache-mime4j-dom:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.james:apache-mime4j-core:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto:auto-common:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.guava:guava:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: commons-io:commons-io:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.core:common:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpcore:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.viewpagerindicator:library:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-v4:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.livefront:bridge:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: com.github.mirrajabi:search-dialog:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:customtabs:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-fragment:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-compat:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:runtime:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.http.legacy-android-27" level="project" />
   </component>
 </module>