Skip to content

Commit d455d71

Browse files
JimSekerJimSeker
committed
gradle update.
1 parent 51dd8fd commit d455d71

File tree

34 files changed

+97
-247
lines changed

34 files changed

+97
-247
lines changed

‎HelloOpenGLES20/.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎HelloOpenGLES20/HelloOpenGLES20.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1515
</content>
16-
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
16+
<orderEntry type="jdk" jdkName="JDK" jdkType="JavaSDK" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
</component>
1919
</module>

‎HelloOpenGLES20/app/app.iml

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
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" />
20-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
20+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug" />
2121
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2222
</configuration>
2323
</facet>
@@ -68,48 +68,26 @@
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7070
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7871
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7972
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
8073
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
8174
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
8275
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8376
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8477
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
9287
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
10088
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
10389
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
10690
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
107-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
109-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
110-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
111-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
112-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
11391
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
11492
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
11593
</content>

‎HelloOpenGLES20/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
google()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.3.1'
8+
classpath 'com.android.tools.build:gradle:3.3.2'
99
}
1010
}
1111

‎HelloOpenGLES30/.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎HelloOpenGLES30/HelloOpenGLES30.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1515
</content>
16-
<orderEntry type="inheritedJdk" />
16+
<orderEntry type="jdk" jdkName="JDK" jdkType="JavaSDK" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
</component>
1919
</module>

‎HelloOpenGLES30/app/app.iml

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
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" />
20-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
20+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug" />
2121
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2222
</configuration>
2323
</facet>
@@ -47,62 +47,47 @@
4747
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4848
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
4949
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
50-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
51-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
52-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
53-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
54-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
56-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
5750
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5851
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5952
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
6053
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
6154
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
6255
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
6356
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7070
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7871
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7972
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
8073
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
8174
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
8275
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8376
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8477
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9087
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
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/lint" />
9688
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
9889
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
10090
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
10691
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
10792
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
10893
</content>

‎HelloOpenGLES30/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.3.1'
9+
classpath 'com.android.tools.build:gradle:3.3.2'
1010

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

‎HelloOpenGLES31/.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎HelloOpenGLES31/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.3.1'
9+
classpath 'com.android.tools.build:gradle:3.3.2'
1010

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

‎HelloOpenGLES32/.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎HelloOpenGLES32/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.3.1'
9+
classpath 'com.android.tools.build:gradle:3.3.2'
1010

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

‎OpenGL30Cube/.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)