Merge pull request #1 from processing/androidx

rupeshkumar22 · web-flow · commit ad0569091b53 · 2021-01-01T01:07:55.000+05:30
Updating forked androidx branch
diff --git a/core/build.gradle b/core/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'aar'
 dependencies {
     implementation name: "android"
 
-    implementationAar "com.android.support:support-v4:${supportLibsVersion}"
+    implementationAar 'androidx.legacy:legacy-support-v4:1.0.0'
     implementationAar "com.google.android.support:wearable:${wearVersion}"  
 }
 
diff --git a/core/src/processing/android/PFragment.java b/core/src/processing/android/PFragment.java
@@ -22,12 +22,14 @@
 
 package processing.android;
 
-import android.support.annotation.IdRes;
-import android.support.annotation.LayoutRes;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+
+import androidx.annotation.IdRes;
+import androidx.annotation.LayoutRes;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
 import android.util.DisplayMetrics;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
diff --git a/core/src/processing/android/PermissionRequestor.java b/core/src/processing/android/PermissionRequestor.java
@@ -24,7 +24,7 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
 import android.support.v4.os.ResultReceiver;
 
 // A simple utility activity to request permissions in a service.
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -45,7 +45,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.Menu;
diff --git a/core/src/processing/core/PSurfaceNone.java b/core/src/processing/core/PSurfaceNone.java
@@ -33,8 +33,8 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.service.wallpaper.WallpaperService;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import android.support.wearable.watchface.WatchFaceService;
 import android.view.LayoutInflater;
 import android.view.SurfaceHolder;
@@ -89,14 +89,15 @@ public AppComponent getComponent() {
 
   @Override
   public Context getContext() {
-    if (component.getKind() == AppComponent.FRAGMENT) {
+		return activity;
+    /*if (component.getKind() == AppComponent.FRAGMENT) {
       return activity;
     } else if (component.getKind() == AppComponent.WALLPAPER) {
       return wallpaper;
     } else if (component.getKind() == AppComponent.WATCHFACE) {
       return watchface;
     }
-    return null;
+		*/
   }
 
 
diff --git a/debug/apps/arscene/build.gradle b/debug/apps/arscene/build.gradle
@@ -25,10 +25,10 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     implementation project(':libs:processing-core')
     implementation project(':libs:processing-ar')
     implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.google.ar:core:1.12.0'
+//    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.google.ar:core:1.22.0'
 }
diff --git a/debug/apps/arscene/gradle.properties b/debug/apps/arscene/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/debug/apps/arscene/src/main/java/arscene/MainActivity.java b/debug/apps/arscene/src/main/java/arscene/MainActivity.java
@@ -6,13 +6,14 @@
 import android.os.Bundle;
 import android.content.Intent;
 import android.provider.Settings;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
-import android.support.v7.app.AppCompatActivity;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
 import processing.android.PFragment;
 import processing.android.CompatUtils;
 import processing.core.PApplet;
@@ -60,13 +61,15 @@ public void onRequestPermissionsResult(int requestCode, String permissions[], in
 
   @Override
   public void onNewIntent(Intent intent) {
+    super.onNewIntent(intent);
     if (sketch != null) {
       sketch.onNewIntent(intent);
     }
   }
 
   @Override
   public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    super.onActivityResult(requestCode, resultCode, data);
     if (sketch != null) {
       sketch.onActivityResult(requestCode, resultCode, data);
     }
diff --git a/debug/apps/fast2d/build.gradle b/debug/apps/fast2d/build.gradle
@@ -25,7 +25,7 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     implementation project(':libs:processing-core')
     implementation 'com.android.support:appcompat-v7:28.0.0'
 }
diff --git a/debug/apps/fast2d/gradle.properties b/debug/apps/fast2d/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/debug/apps/fast2d/src/main/java/fast2d/MainActivity.java b/debug/apps/fast2d/src/main/java/fast2d/MainActivity.java
@@ -4,7 +4,7 @@
 import android.content.Intent;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import processing.android.PFragment;
 import processing.android.CompatUtils;
diff --git a/debug/apps/fast2d/src/main/java/fast2d/Sketch.java b/debug/apps/fast2d/src/main/java/fast2d/Sketch.java
@@ -543,9 +543,9 @@ public void keyPressed() {
     } else if (key == 'f') {
       mode = CLOSE;
     } else if (key == 't') {
-      PGraphics2DX.premultiplyMatrices = true;
+//      PGraphics2DX.premultiplyMatrices = true;
     } else if (key == 'g') {
-      PGraphics2DX.premultiplyMatrices = false;
+//      PGraphics2DX.premultiplyMatrices = false;
     } else if (key == ' ') {
 //      PJOGL pgl = (PJOGL)((PGraphics2D)this.g).pgl;
 //      if (wireframe)
diff --git a/debug/apps/fast2d/src/main/java/fast2d/SketchShapeBenchmark.java b/debug/apps/fast2d/src/main/java/fast2d/SketchShapeBenchmark.java
@@ -23,7 +23,7 @@ public void settings() {
   public void setup() {
     strokeCap(cap);
     strokeJoin(join);
-    PGraphics2DX.premultiplyMatrices = premultiply;
+//    PGraphics2DX.premultiplyMatrices = premultiply;
 
     textFont(createFont("SansSerif", 15 * displayDensity));
   }
diff --git a/debug/apps/simple/build.gradle b/debug/apps/simple/build.gradle
@@ -25,7 +25,7 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     implementation project(':libs:processing-core')
     implementation 'com.android.support:appcompat-v7:28.0.0'
 }
diff --git a/debug/apps/simple/gradle.properties b/debug/apps/simple/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/debug/apps/simple/src/main/java/simple/MainActivity.java b/debug/apps/simple/src/main/java/simple/MainActivity.java
@@ -4,7 +4,7 @@
 import android.content.Intent;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import processing.android.PFragment;
 import processing.android.CompatUtils;
diff --git a/debug/apps/vrcube/build.gradle b/debug/apps/vrcube/build.gradle
@@ -25,10 +25,10 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     implementation project(':libs:processing-core')
     implementation project(':libs:processing-vr')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
+//    implementation 'com.android.support:appcompat-v7:28.0.0'
+//    implementation 'com.android.support:design:28.0.0'
     implementation 'com.google.vr:sdk-base:1.180.0'
 }
diff --git a/debug/apps/vrcube/gradle.properties b/debug/apps/vrcube/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/debug/apps/wallpaper/build.gradle b/debug/apps/wallpaper/build.gradle
@@ -25,7 +25,8 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     implementation project(':libs:processing-core')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-}
+    implementation 'androidx.annotation:annotation:1.1.0'
+//    implementation 'com.android.support:appcompat-v7:28.0.0'
+}
diff --git a/debug/apps/wallpaper/gradle.properties b/debug/apps/wallpaper/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/debug/apps/wallpaper/src/main/java/wallpaper/DebuggerEntryPointActivity.java b/debug/apps/wallpaper/src/main/java/wallpaper/DebuggerEntryPointActivity.java
@@ -2,7 +2,7 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 public class DebuggerEntryPointActivity extends Activity {
     @Override
diff --git a/debug/apps/watchface/build.gradle b/debug/apps/watchface/build.gradle
@@ -26,13 +26,13 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     implementation project(':libs:processing-core')
-    implementation 'com.android.support:palette-v7:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.google.android.gms:play-services-wearable:16.0.1'
-    implementation 'com.android.support:percent:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
-    implementation 'com.google.android.support:wearable:2.4.0'
-    compileOnly 'com.google.android.wearable:wearable:2.4.0'
+//    implementation 'com.android.support:palette-v7:28.0.0'
+//    implementation 'com.android.support:support-v4:28.0.0'
+//    implementation 'com.android.support:percent:28.0.0'
+//    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'com.google.android.gms:play-services-wearable:17.0.0'
+    implementation 'com.google.android.support:wearable:2.8.1'
+    compileOnly 'com.google.android.wearable:wearable:2.8.1'
 }
diff --git a/debug/apps/watchface/gradle.properties b/debug/apps/watchface/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/debug/build.gradle b/debug/build.gradle
@@ -2,11 +2,11 @@
 
 buildscript {
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,11 +15,14 @@ buildscript {
 
 allprojects {
     repositories {
-        // There is a problem in JCenter with some Android pacakges, using the following maven repo
+        // There is a problem in JCenter with some Android packages, using the following maven repo
         // fixes the issue:
         // https://stackoverflow.com/questions/50563338/could-not-find-runtime-jar-android-arch-lifecycleruntime1-0-0/50564224
         maven { url "https://maven.google.com" }
 
+        //
+        maven { url "https://jitpack.io" }
+
         jcenter()
         google()
     }
diff --git a/debug/gradle.properties b/debug/gradle.properties
@@ -0,0 +1,15 @@
+## For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+#
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+#Wed Dec 30 11:02:34 EST 2020
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/debug/libs/processing-ar/build.gradle b/debug/libs/processing-ar/build.gradle
@@ -23,5 +23,5 @@ android {
 
 dependencies {
     implementation project(':libs:processing-core')
-    implementation 'com.google.ar:core:1.12.0'
+    implementation 'com.google.ar:core:1.22.0'
 }
diff --git a/debug/libs/processing-ar/gradle.properties b/debug/libs/processing-ar/gradle.properties
@@ -1,3 +1,5 @@
 POM_NAME=Processing for Android AR Library
 POM_ARTIFACT_ID=processing-ar
-POM_PACKAGING=aar
+POM_PACKAGING=aar
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/debug/libs/processing-core/build.gradle b/debug/libs/processing-core/build.gradle
@@ -22,7 +22,7 @@ android {
 }
 
 dependencies {
-    implementation "com.android.support:support-v4:28.0.0"
-    implementation 'com.google.android.support:wearable:2.4.0'
-    compileOnly 'com.google.android.wearable:wearable:2.4.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.google.android.support:wearable:2.8.1'
+    compileOnly 'com.google.android.wearable:wearable:2.8.1'
 }
diff --git a/debug/libs/processing-core/gradle.properties b/debug/libs/processing-core/gradle.properties
@@ -1,3 +1,5 @@
 POM_NAME=Processing for Android Core Library
 POM_ARTIFACT_ID=processing-core
-POM_PACKAGING=aar
+POM_PACKAGING=aar
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/debug/libs/processing-vr/gradle.properties b/debug/libs/processing-vr/gradle.properties
@@ -1,3 +1,5 @@
 POM_NAME=Processing for Android VR Library
 POM_ARTIFACT_ID=processing-vr
-POM_PACKAGING=aar
+POM_PACKAGING=aar
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1,4 @@
+android.enableJetifier=true
+android.useAndroidX=true
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Thu Apr 30 13:02:23 PDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ apply plugin: 'aar'`
`7`	`7`	`dependencies {`
`8`	`8`	`implementation name: "android"`
`9`	`9`
`10`		`- implementationAar "com.android.support:support-v4:${supportLibsVersion}"`
	`10`	`+ implementationAar 'androidx.legacy:legacy-support-v4:1.0.0'`
`11`	`11`	`implementationAar "com.google.android.support:wearable:${wearVersion}"`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+android.enableJetifier=true`
	`2`	`+android.useAndroidX=true`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ android {`
`25`	`25`
`26`	`26`	`dependencies {`
`27`	`27`	`implementation fileTree(include: ['*.jar'], dir: 'libs')`
`28`		`- testImplementation 'junit:junit:4.12'`
	`28`	`+ testImplementation 'junit:junit:4.13'`
`29`	`29`	`implementation project(':libs:processing-core')`
`30`	`30`	`implementation 'com.android.support:appcompat-v7:28.0.0'`
`31`	`31`	`}`