Build Tools and Target API 28

smart-fun · Nov 2, 2018 · a7760f3 · a7760f3
1 parent ac6aa64
commit a7760f3
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 20 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Apr 24 15:23:23 CEST 2018
+#Fri Nov 02 15:20:16 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/smartgl/build.gradle b/smartgl/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 29
         versionName "1.1.7"
     }
@@ -20,5 +20,5 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:support-annotations:27.1.1'
+    implementation 'com.android.support:support-annotations:28.0.0'
 }
diff --git a/smartgl/src/main/java/fr/arnaudguyon/smartgl/opengl/CollisionCircle.java b/smartgl/src/main/java/fr/arnaudguyon/smartgl/opengl/CollisionCircle.java
@@ -15,7 +15,7 @@
  */
 package fr.arnaudguyon.smartgl.opengl;
 
-import junit.framework.Assert;
+import fr.arnaudguyon.smartgl.tools.Assert;
 
 /**
  * Created by Arnaud Guyon on 07/05/2015.

diff --git a/smartgl/src/main/java/fr/arnaudguyon/smartgl/opengl/CollisionRectangle.java b/smartgl/src/main/java/fr/arnaudguyon/smartgl/opengl/CollisionRectangle.java
@@ -17,7 +17,7 @@
 
 import android.util.Log;
 
-import junit.framework.Assert;
+import fr.arnaudguyon.smartgl.tools.Assert;
 
 /**
  * Created by Arnaud Guyon on 09/05/2015.

diff --git a/smartgl/src/main/java/fr/arnaudguyon/smartgl/opengl/OpenGLRenderer.java b/smartgl/src/main/java/fr/arnaudguyon/smartgl/opengl/OpenGLRenderer.java
@@ -33,10 +33,9 @@
 import android.os.SystemClock;
 import android.util.SparseArray;
 
-import junit.framework.Assert;
-
 import fr.arnaudguyon.smartgl.R;
 import fr.arnaudguyon.smartgl.math.Vector2D;
+import fr.arnaudguyon.smartgl.tools.Assert;
 
 /**
  * Base class for the Renderer. Handles the list of the RenderObject to display, the camera.

diff --git a/smartgl/src/main/java/fr/arnaudguyon/smartgl/opengl/RenderPass.java b/smartgl/src/main/java/fr/arnaudguyon/smartgl/opengl/RenderPass.java
@@ -17,9 +17,10 @@
 
 import java.util.Vector;
 
-import junit.framework.Assert;
 import android.opengl.GLES20;
 
+import fr.arnaudguyon.smartgl.tools.Assert;
+
 public class RenderPass {
 	private final static int NOPROGRAM = 0;
 

diff --git a/smartgl/src/main/java/fr/arnaudguyon/smartgl/opengl/Shader.java b/smartgl/src/main/java/fr/arnaudguyon/smartgl/opengl/Shader.java
@@ -15,10 +15,11 @@
  */
 package fr.arnaudguyon.smartgl.opengl;
 
-import junit.framework.Assert;
 import android.opengl.GLES20;
 import android.util.Log;
 
+import fr.arnaudguyon.smartgl.tools.Assert;
+
 abstract public class Shader {
 
 	private static final String TAG = "Shader";

diff --git a/smartgl/src/main/java/fr/arnaudguyon/smartgl/opengl/ShaderTextureAmbiant.java b/smartgl/src/main/java/fr/arnaudguyon/smartgl/opengl/ShaderTextureAmbiant.java
@@ -17,7 +17,7 @@
 
 import android.opengl.GLES20;
 
-import junit.framework.Assert;
+import fr.arnaudguyon.smartgl.tools.Assert;
 
 /**
  * Created by aguyon on 18.01.17.

diff --git a/smartgl/src/main/java/fr/arnaudguyon/smartgl/opengl/ShaderTextureLights.java b/smartgl/src/main/java/fr/arnaudguyon/smartgl/opengl/ShaderTextureLights.java
@@ -17,10 +17,10 @@
 
 import android.opengl.GLES20;
 
-import junit.framework.Assert;
-
 import java.nio.FloatBuffer;
 
+import fr.arnaudguyon.smartgl.tools.Assert;
+
 /**
  * Created by aguyon on 18.01.17.
  */

diff --git a/smartgl/src/main/java/fr/arnaudguyon/smartgl/tools/Assert.java b/smartgl/src/main/java/fr/arnaudguyon/smartgl/tools/Assert.java
@@ -0,0 +1,41 @@
+package fr.arnaudguyon.smartgl.tools;
+
+public class Assert {
+
+    public static void assertTrue(boolean condition) {
+        assertTrue("", condition);
+    }
+    public static void assertTrue(String text, boolean condition) {
+        if (!condition) {
+            doAssert(text);
+        }
+    }
+    public static void assertNotNull(Object object) {
+        assertNotNull("", object);
+    }
+    public static void assertNotNull(String text, Object object) {
+        if (object == null) {
+            doAssert(text);
+        }
+    }
+
+    public static void assertEquals(Object object1, Object object2) {
+        if (object1 == null) {
+            if (object2 != null) {
+                doAssert("");
+            }
+        } else {
+            if (object2 == null) {
+                doAssert("");
+            } else {
+                if (!object1.equals(object2)) {
+                    doAssert("");
+                }
+            }
+        }
+    }
+
+    private static void doAssert(String text) {
+        throw new RuntimeException(text);
+    }
+}
diff --git a/smartglapp/build.gradle b/smartglapp/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "fr.arnaudguyon.smartglapp"
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 15
         versionName "1.0.3"
     }
@@ -21,6 +21,6 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:support-annotations:27.1.1'
+    implementation 'com.android.support:support-annotations:28.0.0'
     implementation project(':smartgl')
 }