Updates after last pull-request.

* Remove local proguard config. * Don't use JACK (greater compatibility with older JDKs). * Remove Eclipse project files (using Android Studio + gradle now) and other cleanups.
learnopengles · Aug 8, 2016 · 0de3a62 · 0de3a62
1 parent cb5b4b7
commit 0de3a62
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 150 deletions.
diff --git a/android/AndroidOpenGLESLessons/.classpath b/android/AndroidOpenGLESLessons/.classpath
diff --git a/android/AndroidOpenGLESLessons/.gitignore b/android/AndroidOpenGLESLessons/.gitignore
@@ -1,6 +1,5 @@
-/gen
-/bin
 .idea/
-*.iml
+.gradle/
 build/
+*.iml
 local.properties
diff --git a/android/AndroidOpenGLESLessons/.project b/android/AndroidOpenGLESLessons/.project
diff --git a/android/AndroidOpenGLESLessons/.settings/org.eclipse.jdt.core.prefs b/android/AndroidOpenGLESLessons/.settings/org.eclipse.jdt.core.prefs
diff --git a/android/AndroidOpenGLESLessons/AUTHORS-LIBGDX.TXT b/android/AndroidOpenGLESLessons/AUTHORS-LIBGDX.TXT
diff --git a/android/AndroidOpenGLESLessons/LICENSE.TXT b/android/AndroidOpenGLESLessons/LICENSE.TXT
@@ -1,4 +1,4 @@
- Copyright 2011-2012 Learn OpenGL ES
+ Copyright 2011-2016 Learn OpenGL ES
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/android/AndroidOpenGLESLessons/app/build.gradle b/android/AndroidOpenGLESLessons/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "24.0.0"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         applicationId "com.learnopengles.android"
@@ -24,7 +24,6 @@ android {
     buildTypes {
         release {
             minifyEnabled true
-            proguardFile file("$rootProject.projectDir/proguard.cfg")
             signingConfig signingConfigs.release
         }
     }

diff --git a/android/AndroidOpenGLESLessons/app/lint.xml b/android/AndroidOpenGLESLessons/app/lint.xml
diff --git a/android/AndroidOpenGLESLessons/proguard.cfg b/android/AndroidOpenGLESLessons/proguard.cfg
diff --git a/android/AndroidOpenGLESLessons/project.properties b/android/AndroidOpenGLESLessons/project.properties
diff --git a/webgl/WebGLLessons/.project b/webgl/WebGLLessons/.project
diff --git a/webgl/WebGLLessons/.settings/.jsdtscope b/webgl/WebGLLessons/.settings/.jsdtscope
diff --git a/webgl/WebGLLessons/.settings/org.eclipse.wst.jsdt.ui.superType.container b/webgl/WebGLLessons/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/webgl/WebGLLessons/.settings/org.eclipse.wst.jsdt.ui.superType.name b/webgl/WebGLLessons/.settings/org.eclipse.wst.jsdt.ui.superType.name