Skip to content

Commit 0b4452d

Browse files
DziubaVLaDDziubaVLaD
committed
gradle build fix
1 parent 2536965 commit 0b4452d

File tree

8 files changed

+180
-105
lines changed

8 files changed

+180
-105
lines changed

‎.idea/misc.xml

Lines changed: 26 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/app.iml

Lines changed: 86 additions & 54 deletions
Large diffs are not rendered by default.

‎app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apply plugin: 'com.android.application'
2-
2+
android.defaultConfig.javaCompileOptions.annotationProcessorOptions.includeCompileClasspath = true
33
android {
44
compileSdkVersion 21
5-
buildToolsVersion "21.1.2"
5+
buildToolsVersion '27.0.3'
66

77
defaultConfig {
88
applicationId "com.yzy.supercleanmaster"

‎build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ buildscript {
44
repositories {
55
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
66
jcenter()
7+
google()
78
}
89
dependencies {
9-
classpath 'com.android.tools.build:gradle:1.0.0'
10+
classpath 'com.android.tools.build:gradle:3.1.4'
1011

1112
// NOTE: Do not place your application dependencies here; they belong
1213
// in the individual module build.gradle files

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Sun Sep 09 15:31:16 MSK 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

‎library/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ android {
66
}
77
}
88
compileSdkVersion 21
9-
buildToolsVersion "21.1.1"
9+
buildToolsVersion '27.0.3'
1010
defaultConfig {
1111
minSdkVersion 14
1212
targetSdkVersion 21

‎library/library.iml

Lines changed: 57 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":library" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -11,82 +11,105 @@
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
1212
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1313
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
14-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
15-
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16-
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
14+
<afterSyncTasks>
15+
<task>generateDebugSources</task>
16+
</afterSyncTasks>
1717
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1818
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1919
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
2020
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
2121
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
22-
<option name="LIBRARY_PROJECT" value="true" />
22+
<option name="PROJECT_TYPE" value="1" />
2323
</configuration>
2424
</facet>
2525
</component>
26-
<component name="NewModuleRootManager" inherit-compiler-output="false">
26+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
2727
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2829
<exclude-output />
2930
<content url="file://$MODULE_DIR$">
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3032
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3133
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3234
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3335
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3436
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
40-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
4246
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4347
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4448
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4549
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4650
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
47-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4851
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
4967
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5068
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5169
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5270
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5371
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
54-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5572
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
5681
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
5782
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
5883
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
5984
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6085
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
61-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6286
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
63-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
64-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
87+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
6590
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
66-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
67-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
69-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7091
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
71-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
72-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_and_local_jars_jni" />
7596
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
79101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
80102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
81104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
82106
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
83107
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
84108
</content>
85109
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
86110
<orderEntry type="sourceFolder" forTests="false" />
87-
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
88-
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
89-
<orderEntry type="library" exported="" name="recyclerview-v7-21.0.3" level="project" />
111+
<orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-21.0.3" level="project" />
112+
<orderEntry type="library" name="Gradle: com.android.support:support-v4-21.0.3" level="project" />
113+
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:21.0.3@jar" level="project" />
90114
</component>
91-
</module>
92-
115+
</module>

‎superCleanMaster.iml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id="superCleanMaster" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>
66
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
7+
<option name="BUILDABLE" value="false" />
78
</configuration>
89
</facet>
910
</component>
10-
<component name="NewModuleRootManager" inherit-compiler-output="false">
11-
<output url="file://$MODULE_DIR$/build/classes/main" />
12-
<output-test url="file://$MODULE_DIR$/build/classes/test" />
11+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
1312
<exclude-output />
1413
<content url="file://$MODULE_DIR$">
1514
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1615
</content>
1716
<orderEntry type="inheritedJdk" />
1817
<orderEntry type="sourceFolder" forTests="false" />
1918
</component>
20-
</module>
21-
19+
</module>

0 commit comments

Comments
 (0)