From 0de3a6281c84bbd84f311b314467fb5e02ed86de Mon Sep 17 00:00:00 2001 From: Learn OpenGL ES Date: Mon, 8 Aug 2016 09:19:56 -0400 Subject: [PATCH] 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. --- android/AndroidOpenGLESLessons/.classpath | 9 ----- android/AndroidOpenGLESLessons/.gitignore | 5 +-- android/AndroidOpenGLESLessons/.project | 33 --------------- .../.settings/org.eclipse.jdt.core.prefs | 12 ------ .../AndroidOpenGLESLessons/AUTHORS-LIBGDX.TXT | 10 ----- android/AndroidOpenGLESLessons/LICENSE.TXT | 2 +- .../AndroidOpenGLESLessons/app/build.gradle | 3 +- android/AndroidOpenGLESLessons/app/lint.xml | 3 -- android/AndroidOpenGLESLessons/proguard.cfg | 40 ------------------- .../AndroidOpenGLESLessons/project.properties | 11 ----- webgl/WebGLLessons/.project | 17 -------- webgl/WebGLLessons/.settings/.jsdtscope | 7 ---- ...rg.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - 14 files changed, 4 insertions(+), 150 deletions(-) delete mode 100644 android/AndroidOpenGLESLessons/.classpath delete mode 100644 android/AndroidOpenGLESLessons/.project delete mode 100644 android/AndroidOpenGLESLessons/.settings/org.eclipse.jdt.core.prefs delete mode 100644 android/AndroidOpenGLESLessons/AUTHORS-LIBGDX.TXT delete mode 100644 android/AndroidOpenGLESLessons/app/lint.xml delete mode 100644 android/AndroidOpenGLESLessons/proguard.cfg delete mode 100644 android/AndroidOpenGLESLessons/project.properties delete mode 100644 webgl/WebGLLessons/.project delete mode 100644 webgl/WebGLLessons/.settings/.jsdtscope delete mode 100644 webgl/WebGLLessons/.settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 webgl/WebGLLessons/.settings/org.eclipse.wst.jsdt.ui.superType.name diff --git a/android/AndroidOpenGLESLessons/.classpath b/android/AndroidOpenGLESLessons/.classpath deleted file mode 100644 index dd0ca2d..0000000 --- a/android/AndroidOpenGLESLessons/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/android/AndroidOpenGLESLessons/.gitignore b/android/AndroidOpenGLESLessons/.gitignore index 2ebe410..faa1c80 100644 --- a/android/AndroidOpenGLESLessons/.gitignore +++ b/android/AndroidOpenGLESLessons/.gitignore @@ -1,6 +1,5 @@ -/gen -/bin .idea/ -*.iml +.gradle/ build/ +*.iml local.properties \ No newline at end of file diff --git a/android/AndroidOpenGLESLessons/.project b/android/AndroidOpenGLESLessons/.project deleted file mode 100644 index a218826..0000000 --- a/android/AndroidOpenGLESLessons/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - AndroidOpenGLESLessons - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/android/AndroidOpenGLESLessons/.settings/org.eclipse.jdt.core.prefs b/android/AndroidOpenGLESLessons/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 9a2600a..0000000 --- a/android/AndroidOpenGLESLessons/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Sat Sep 24 22:26:41 EDT 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/android/AndroidOpenGLESLessons/AUTHORS-LIBGDX.TXT b/android/AndroidOpenGLESLessons/AUTHORS-LIBGDX.TXT deleted file mode 100644 index e55a032..0000000 --- a/android/AndroidOpenGLESLessons/AUTHORS-LIBGDX.TXT +++ /dev/null @@ -1,10 +0,0 @@ -# This is the official list of the AUTHORS of libgdx -# for copyright purposes. -# This file is distinct from the CONTRIBUTORS files. -# See the latter for an explanation. - -# Names should be added to this file as -# Name or Organization -# The email address is not required for organizations. -Mario Zechner -Nathan Sweet \ No newline at end of file diff --git a/android/AndroidOpenGLESLessons/LICENSE.TXT b/android/AndroidOpenGLESLessons/LICENSE.TXT index 7167d71..5499551 100644 --- 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 index 30df683..551907d 100644 --- 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 deleted file mode 100644 index ee0eead..0000000 --- a/android/AndroidOpenGLESLessons/app/lint.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/android/AndroidOpenGLESLessons/proguard.cfg b/android/AndroidOpenGLESLessons/proguard.cfg deleted file mode 100644 index b1cdf17..0000000 --- a/android/AndroidOpenGLESLessons/proguard.cfg +++ /dev/null @@ -1,40 +0,0 @@ --optimizationpasses 5 --dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses --dontpreverify --verbose --optimizations !code/simplification/arithmetic,!field/*,!class/merging/* - --keep public class * extends android.app.Activity --keep public class * extends android.app.Application --keep public class * extends android.app.Service --keep public class * extends android.content.BroadcastReceiver --keep public class * extends android.content.ContentProvider --keep public class * extends android.app.backup.BackupAgentHelper --keep public class * extends android.preference.Preference --keep public class com.android.vending.licensing.ILicensingService - --keepclasseswithmembernames class * { - native ; -} - --keepclasseswithmembers class * { - public (android.content.Context, android.util.AttributeSet); -} - --keepclasseswithmembers class * { - public (android.content.Context, android.util.AttributeSet, int); -} - --keepclassmembers class * extends android.app.Activity { - public void *(android.view.View); -} - --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - --keep class * implements android.os.Parcelable { - public static final android.os.Parcelable$Creator *; -} diff --git a/android/AndroidOpenGLESLessons/project.properties b/android/AndroidOpenGLESLessons/project.properties deleted file mode 100644 index c4f09d2..0000000 --- a/android/AndroidOpenGLESLessons/project.properties +++ /dev/null @@ -1,11 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-17 diff --git a/webgl/WebGLLessons/.project b/webgl/WebGLLessons/.project deleted file mode 100644 index 491cca5..0000000 --- a/webgl/WebGLLessons/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - WebGLLessons - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/webgl/WebGLLessons/.settings/.jsdtscope b/webgl/WebGLLessons/.settings/.jsdtscope deleted file mode 100644 index be3d72d..0000000 --- a/webgl/WebGLLessons/.settings/.jsdtscope +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/webgl/WebGLLessons/.settings/org.eclipse.wst.jsdt.ui.superType.container b/webgl/WebGLLessons/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/webgl/WebGLLessons/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/webgl/WebGLLessons/.settings/org.eclipse.wst.jsdt.ui.superType.name b/webgl/WebGLLessons/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/webgl/WebGLLessons/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file