[v1.5.3]migrate to AndroidX; Update library versions and AGP versions

ChillingVan · Nov 16, 2022 · cad8d58 · cad8d58
1 parent 98beac9
commit cad8d58
Show file tree

Hide file tree

Showing 69 changed files with 272 additions and 203 deletions.
diff --git a/build.gradle b/build.gradle
@@ -21,24 +21,23 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.6.21'
     repositories {
-        maven{url"https://maven.google.com"}
-        jcenter()
         google()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.android.tools.build:gradle:4.2.2'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
 allprojects {
     repositories {
-        maven{url"https://maven.google.com"}
-        jcenter()
         google()
+        mavenCentral()
     }
 }
 

diff --git a/canvasgl/build.gradle b/canvasgl/build.gradle
@@ -19,18 +19,20 @@
  */
 
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
-group='com.github.ChillingVan'
-def VERSION_NAME="1.5.2.0"
+apply plugin: 'maven-publish'
+def NAMESPACE="com.github.ChillingVan"
+group = NAMESPACE
+def VERSION_NAME="1.5.3.0"
 
 android {
-    compileSdkVersion 31
+    namespace = NAMESPACE
+    compileSdkVersion 32
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 31
-        versionCode 105020
+        targetSdkVersion 32
+        versionCode 105030
         versionName VERSION_NAME
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
@@ -55,7 +57,7 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:support-annotations:28.0.0'
+    implementation 'androidx.annotation:annotation:1.3.0'
 }
 
 
@@ -84,14 +86,18 @@ artifacts {
     archives javadocJar
 }
 
-/**
- * Used to support other project uses mavenLocal() to refer this project which is convenient to debug
- */
-install {
-    repositories.mavenInstaller {
-        pom.version = 'v' + VERSION_NAME
-        pom.artifactId = 'android-openGL-canvas'
+
+afterEvaluate {
+    publishing {
+        publications {
+            // Creates a Maven publication called "release".
+            release(MavenPublication) {
+                from components.release
+                groupId = NAMESPACE
+                artifactId = 'android-openGL-canvas'
+                version = VERSION_NAME
+            }
+        }
     }
 }
 
-
diff --git a/canvasgl/src/main/java/com/chillingvan/canvasgl/CanvasGL.java b/canvasgl/src/main/java/com/chillingvan/canvasgl/CanvasGL.java
@@ -28,9 +28,6 @@
 import android.graphics.SurfaceTexture;
 import android.opengl.GLES20;
 import android.os.Build;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
 import com.chillingvan.canvasgl.glcanvas.BasicTexture;
 import com.chillingvan.canvasgl.glcanvas.BitmapTexture;
@@ -50,6 +47,10 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * All the depth of textures are the same. So the texture drawn after will cover the texture drawn before.
  */

diff --git a/canvasgl/src/main/java/com/chillingvan/canvasgl/ICanvasGL.java b/canvasgl/src/main/java/com/chillingvan/canvasgl/ICanvasGL.java
@@ -26,9 +26,9 @@
 import android.graphics.SurfaceTexture;
 import android.opengl.GLES20;
 import android.opengl.Matrix;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.chillingvan.canvasgl.glcanvas.BasicTexture;
 import com.chillingvan.canvasgl.glcanvas.BitmapTexture;

diff --git a/canvasgl/src/main/java/com/chillingvan/canvasgl/OffScreenCanvas.java b/canvasgl/src/main/java/com/chillingvan/canvasgl/OffScreenCanvas.java
@@ -21,7 +21,6 @@
 package com.chillingvan.canvasgl;
 
 import android.graphics.SurfaceTexture;
-import android.support.annotation.Nullable;
 
 import com.chillingvan.canvasgl.glcanvas.BasicTexture;
 import com.chillingvan.canvasgl.glcanvas.RawTexture;
@@ -32,6 +31,8 @@
 
 import java.util.List;
 
+import androidx.annotation.Nullable;
+
 /**
  * @deprecated use {@link MultiTexOffScreenCanvas} instead
  */

diff --git a/canvasgl/src/main/java/com/chillingvan/canvasgl/glcanvas/GLCanvas.java b/canvasgl/src/main/java/com/chillingvan/canvasgl/glcanvas/GLCanvas.java
@@ -23,7 +23,7 @@
 import android.graphics.Bitmap;
 import android.graphics.Rect;
 import android.graphics.RectF;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.chillingvan.canvasgl.shapeFilter.DrawShapeFilter;
 import com.chillingvan.canvasgl.textureFilter.TextureFilter;

diff --git a/canvasgl/src/main/java/com/chillingvan/canvasgl/glview/texture/BaseGLCanvasTextureView.java b/canvasgl/src/main/java/com/chillingvan/canvasgl/glview/texture/BaseGLCanvasTextureView.java
@@ -4,7 +4,6 @@
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Rect;
-import android.support.annotation.ColorInt;
 import android.util.AttributeSet;
 
 import com.chillingvan.canvasgl.CanvasGL;
@@ -13,6 +12,8 @@
 import com.chillingvan.canvasgl.glview.GLView;
 import com.chillingvan.canvasgl.util.Loggers;
 
+import androidx.annotation.ColorInt;
+
 /**
  *
  * From init to run: onSizeChange --> onSurfaceTextureAvailable --> createGLThread --> createSurface --> onSurfaceCreated --> onSurfaceChanged

diff --git a/canvasgl/src/main/java/com/chillingvan/canvasgl/glview/texture/BaseGLTextureView.java b/canvasgl/src/main/java/com/chillingvan/canvasgl/glview/texture/BaseGLTextureView.java
@@ -22,19 +22,20 @@
 
 import android.content.Context;
 import android.graphics.SurfaceTexture;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.TextureView;
 
 import com.chillingvan.canvasgl.ICanvasGL;
-import com.chillingvan.canvasgl.util.Loggers;
 import com.chillingvan.canvasgl.glview.texture.gles.EglContextWrapper;
 import com.chillingvan.canvasgl.glview.texture.gles.GLThread;
+import com.chillingvan.canvasgl.util.Loggers;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.Nullable;
+
 /**
  * Created by Chilling on 2016/10/31.
  * Can be used in ScrollView or ListView.

diff --git a/canvasgl/src/main/java/com/chillingvan/canvasgl/glview/texture/GLSharedContextView.java b/canvasgl/src/main/java/com/chillingvan/canvasgl/glview/texture/GLSharedContextView.java
@@ -22,7 +22,6 @@
 
 import android.content.Context;
 import android.graphics.SurfaceTexture;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 
 import com.chillingvan.canvasgl.ICanvasGL;
@@ -31,6 +30,8 @@
 
 import java.util.List;
 
+import androidx.annotation.Nullable;
+
 /**
  * This class is used to accept eglContext and texture from outside. Then it can use them to draw.
  * @deprecated Use {@link GLMultiTexConsumerView} instead.

diff --git a/...l/src/main/java/com/chillingvan/canvasgl/glview/texture/GLSurfaceTextureProducerView.java b/...l/src/main/java/com/chillingvan/canvasgl/glview/texture/GLSurfaceTextureProducerView.java
@@ -22,7 +22,6 @@
 
 import android.content.Context;
 import android.graphics.SurfaceTexture;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 
 import com.chillingvan.canvasgl.ICanvasGL;
@@ -32,6 +31,8 @@
 
 import java.util.List;
 
+import androidx.annotation.Nullable;
+
 /**
  * <p>
  * This will generate a texture which is in the eglContext of the CanvasGL. And the texture can be used outside.

diff --git a/canvasgl/src/main/java/com/chillingvan/canvasgl/glview/texture/gles/EglHelperAPI17.java b/canvasgl/src/main/java/com/chillingvan/canvasgl/glview/texture/gles/EglHelperAPI17.java
@@ -1,17 +1,17 @@
 package com.chillingvan.canvasgl.glview.texture.gles;
 
-import android.nfc.Tag;
 import android.opengl.EGL14;
 import android.opengl.EGLConfig;
 import android.opengl.EGLContext;
 import android.opengl.EGLDisplay;
 import android.opengl.EGLExt;
 import android.opengl.EGLSurface;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
 
 import com.chillingvan.canvasgl.util.FileLogger;
 
+import androidx.annotation.RequiresApi;
+
 import static com.chillingvan.canvasgl.glview.texture.gles.EglHelper.formatEglError;
 
 /**

diff --git a/canvasgl/src/main/java/com/chillingvan/canvasgl/glview/texture/gles/GLThread.java b/canvasgl/src/main/java/com/chillingvan/canvasgl/glview/texture/gles/GLThread.java
@@ -24,8 +24,6 @@
 import android.opengl.EGL14;
 import android.opengl.EGLExt;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
 import android.util.Log;
 import android.view.Choreographer;
 
@@ -42,6 +40,9 @@
 import javax.microedition.khronos.egl.EGLSurface;
 import javax.microedition.khronos.opengles.GL;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+
 /**
  * This is the thread where the gl draw runs in.
  * Create GL Context --> Create Surface

diff --git a/canvasgl/src/main/java/com/chillingvan/canvasgl/shapeFilter/DrawCircleFilter.java b/canvasgl/src/main/java/com/chillingvan/canvasgl/shapeFilter/DrawCircleFilter.java
@@ -1,11 +1,12 @@
 package com.chillingvan.canvasgl.shapeFilter;
 
 import android.opengl.GLES20;
-import android.support.annotation.FloatRange;
 
 import com.chillingvan.canvasgl.ICanvasGL;
 import com.chillingvan.canvasgl.OpenGLUtil;
 
+import androidx.annotation.FloatRange;
+
 /**
  * Created by Chilling on 2016/11/11.
  */

diff --git a/canvasgl/src/main/java/com/chillingvan/canvasgl/textureFilter/ColorMatrixFilter.java b/canvasgl/src/main/java/com/chillingvan/canvasgl/textureFilter/ColorMatrixFilter.java
@@ -1,12 +1,13 @@
 package com.chillingvan.canvasgl.textureFilter;
 
 import android.opengl.GLES20;
-import android.support.annotation.FloatRange;
 
 import com.chillingvan.canvasgl.ICanvasGL;
 import com.chillingvan.canvasgl.OpenGLUtil;
 import com.chillingvan.canvasgl.glcanvas.BasicTexture;
 
+import androidx.annotation.FloatRange;
+
 /**
  * Created by Chilling on 2017/4/15.
  */

diff --git a/canvasgl/src/main/java/com/chillingvan/canvasgl/textureFilter/ContrastFilter.java b/canvasgl/src/main/java/com/chillingvan/canvasgl/textureFilter/ContrastFilter.java
@@ -21,12 +21,13 @@
 package com.chillingvan.canvasgl.textureFilter;
 
 import android.opengl.GLES20;
-import android.support.annotation.FloatRange;
 
 import com.chillingvan.canvasgl.ICanvasGL;
 import com.chillingvan.canvasgl.OpenGLUtil;
 import com.chillingvan.canvasgl.glcanvas.BasicTexture;
 
+import androidx.annotation.FloatRange;
+
 /**
  * Created by Matthew on 2016/10/14.
  */

diff --git a/canvasgl/src/main/java/com/chillingvan/canvasgl/textureFilter/DarkenBlendFilter.java b/canvasgl/src/main/java/com/chillingvan/canvasgl/textureFilter/DarkenBlendFilter.java
@@ -21,7 +21,7 @@
 package com.chillingvan.canvasgl.textureFilter;
 
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Created by Chilling on 2016/10/17.

diff --git a/...main/java/com/chillingvan/canvasgl/textureFilter/DirectionalSobelEdgeDetectionFilter.java b/...main/java/com/chillingvan/canvasgl/textureFilter/DirectionalSobelEdgeDetectionFilter.java
@@ -20,7 +20,7 @@
 
 package com.chillingvan.canvasgl.textureFilter;
 
-import android.support.annotation.FloatRange;
+import androidx.annotation.FloatRange;
 
 /**
  * Created by Chilling on 2016/11/6.

diff --git a/canvasgl/src/main/java/com/chillingvan/canvasgl/textureFilter/GammaFilter.java b/canvasgl/src/main/java/com/chillingvan/canvasgl/textureFilter/GammaFilter.java
@@ -21,12 +21,13 @@
 package com.chillingvan.canvasgl.textureFilter;
 
 import android.opengl.GLES20;
-import android.support.annotation.FloatRange;
 
 import com.chillingvan.canvasgl.ICanvasGL;
 import com.chillingvan.canvasgl.OpenGLUtil;
 import com.chillingvan.canvasgl.glcanvas.BasicTexture;
 
+import androidx.annotation.FloatRange;
+
 /**
  * Created by Chilling on 2016/11/2.
  */

diff --git a/canvasgl/src/main/java/com/chillingvan/canvasgl/textureFilter/HueFilter.java b/canvasgl/src/main/java/com/chillingvan/canvasgl/textureFilter/HueFilter.java
@@ -21,12 +21,13 @@
 package com.chillingvan.canvasgl.textureFilter;
 
 import android.opengl.GLES20;
-import android.support.annotation.FloatRange;
 
 import com.chillingvan.canvasgl.ICanvasGL;
 import com.chillingvan.canvasgl.OpenGLUtil;
 import com.chillingvan.canvasgl.glcanvas.BasicTexture;
 
+import androidx.annotation.FloatRange;
+
 /**
  * Created by Chilling on 2016/11/1.
  */

diff --git a/canvasgl/src/main/java/com/chillingvan/canvasgl/textureFilter/LightenBlendFilter.java b/canvasgl/src/main/java/com/chillingvan/canvasgl/textureFilter/LightenBlendFilter.java
@@ -21,7 +21,7 @@
 package com.chillingvan.canvasgl.textureFilter;
 
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Created by Chilling on 2016/10/23.

diff --git a/canvasgl/src/main/java/com/chillingvan/canvasgl/textureFilter/LookupFilter.java b/canvasgl/src/main/java/com/chillingvan/canvasgl/textureFilter/LookupFilter.java
@@ -2,13 +2,14 @@
 
 import android.graphics.Bitmap;
 import android.opengl.GLES20;
-import android.support.annotation.FloatRange;
-import android.support.annotation.NonNull;
 
 import com.chillingvan.canvasgl.ICanvasGL;
 import com.chillingvan.canvasgl.OpenGLUtil;
 import com.chillingvan.canvasgl.glcanvas.BasicTexture;
 
+import androidx.annotation.FloatRange;
+import androidx.annotation.NonNull;
+
 /**
  * Created by Chilling on 2018/5/4.
  */

diff --git a/canvasgl/src/main/java/com/chillingvan/canvasgl/textureFilter/PixelationFilter.java b/canvasgl/src/main/java/com/chillingvan/canvasgl/textureFilter/PixelationFilter.java
@@ -21,12 +21,13 @@
 package com.chillingvan.canvasgl.textureFilter;
 
 import android.opengl.GLES20;
-import android.support.annotation.FloatRange;
 
 import com.chillingvan.canvasgl.ICanvasGL;
 import com.chillingvan.canvasgl.OpenGLUtil;
 import com.chillingvan.canvasgl.glcanvas.BasicTexture;
 
+import androidx.annotation.FloatRange;
+
 /**
  * Created by Chilling on 2016/11/1.
  */