Skip to content

Commit 7a50017

Browse files
JimSekerJimSeker
committed
upgraded gradle, API, and added maven, updated gitignore.
1 parent e739f83 commit 7a50017

File tree

132 files changed

+797
-1040
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+797
-1040
lines changed

‎HelloOpenGLES20/.gitignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
*.iml
22
.gradle
33
/local.properties
4-
/.idea/workspace.xml
4+
/.idea/caches
55
/.idea/libraries
6+
/.idea/modules.xml
7+
/.idea/workspace.xml
8+
/.idea/navEditor.xml
9+
/.idea/assetWizardSettings.xml
610
.DS_Store
711
/build
812
/captures
913
.externalNativeBuild
10-
/.idea/caches

‎HelloOpenGLES20/.idea/gradle.xml

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

‎HelloOpenGLES20/.idea/misc.xml

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

‎HelloOpenGLES20/.idea/vcs.xml

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

‎HelloOpenGLES20/app/app.iml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,20 @@
2323
</facet>
2424
</component>
2525
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
26-
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
27-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
26+
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
27+
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
2828
<exclude-output />
2929
<content url="file://$MODULE_DIR$">
3030
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
31-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
32-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
3332
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
3534
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3635
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3736
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
4038
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
4240
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4341
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4442
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
@@ -84,19 +82,30 @@
8482
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8583
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8684
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
8788
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8889
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8990
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
9093
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
9195
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
9297
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
9398
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
9499
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
95101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
96103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
97105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
98106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
99107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
100109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
101110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
102111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />

‎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.1.4'
8+
classpath 'com.android.tools.build:gradle:3.3.1'
99
}
1010
}
1111

‎HelloOpenGLES20/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Sep 14 09:02:40 MDT 2018
1+
#Thu Feb 21 14:58:25 MST 2019
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-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

‎HelloOpenGLES30/.gitignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
*.iml
22
.gradle
33
/local.properties
4-
/.idea/workspace.xml
4+
/.idea/caches
55
/.idea/libraries
6+
/.idea/modules.xml
7+
/.idea/workspace.xml
8+
/.idea/navEditor.xml
9+
/.idea/assetWizardSettings.xml
610
.DS_Store
711
/build
812
/captures
913
.externalNativeBuild
10-
/.idea/caches

‎HelloOpenGLES30/.idea/codeStyles/Project.xml

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

‎HelloOpenGLES30/.idea/compiler.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎HelloOpenGLES30/.idea/copyright/profiles_settings.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎HelloOpenGLES30/.idea/gradle.xml

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

‎HelloOpenGLES30/.idea/misc.xml

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

‎HelloOpenGLES30/.idea/vcs.xml

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

‎HelloOpenGLES30/HelloOpenGLES30.iml

Lines changed: 2 additions & 2 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.id="HelloOpenGLES30" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id="HelloOpenGLES30" 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>
@@ -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="inheritedJdk" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
</component>
1919
</module>

0 commit comments

Comments
 (0)