Skip to content

Commit 763e3e5

Browse files
authored
Merge pull request #620 from processing/revert-616-master
Revert "Core AndroidX support and creation of distributions for JCentre "
2 parents f273a7e + 71bdb3f commit 763e3e5

File tree

136 files changed

+99
-96507
lines changed

Some content is hidden

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

136 files changed

+99
-96507
lines changed

build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ allprojects {
2626
versions.load(project.rootProject.file("mode/version.properties").newDataInputStream())
2727
ext.targetSdkVersion = versions.getProperty("android-platform")
2828
ext.supportLibsVersion = versions.getProperty("com.android.support%support-v4")
29-
ext.supportLibsVersionAndroidX=versions.getProperty("androidx.appcompat%appcompat")
3029
ext.wearVersion = versions.getProperty("com.google.android.support%wearable")
3130
ext.gvrVersion = versions.getProperty("com.google.vr")
3231
ext.garVersion = versions.getProperty("com.google.ar")
@@ -40,7 +39,6 @@ allprojects {
4039
Properties modeProperties = new Properties()
4140
modeProperties.load(project.rootProject.file("mode/mode.properties").newDataInputStream())
4241
ext.modeVersion = modeProperties.getProperty("prettyVersion")
43-
ext.modeVersionAndroidX = modeProperties.getProperty("prettyVersionAndroidX")
4442

4543
Properties vrProperties = new Properties()
4644
vrProperties.load(project.rootProject.file("mode/libraries/vr/library.properties").newDataInputStream())
@@ -51,7 +49,6 @@ allprojects {
5149
ext.arLibVersion = arProperties.getProperty("prettyVersion")
5250

5351

54-
5552
def fn = project.rootProject.file("local.properties")
5653
if (!fn.exists()) {
5754
if (System.env["ANDROID_SDK"] != null) {

core-androidx/build.gradle

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

core-androidx/src/assets/shaders/ColorFrag.glsl

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

core-androidx/src/assets/shaders/ColorVert.glsl

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

core-androidx/src/assets/shaders/LightFrag.glsl

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

0 commit comments

Comments
 (0)