diff --git a/core/build.gradle b/core/build.gradle index 002621c9a..b45fede08 100644 --- 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 index 1a2132ed3..859580dfd 100644 --- 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 index 93c939238..fb8d59443 100644 --- 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 index 24e5dd3a7..8c0651e2c 100644 --- 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 index cd350b873..901848ca4 100644 --- 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/gradle.properties b/gradle.properties new file mode 100644 index 000000000..5465fec0e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2c2bbe5f9..f68335fce 100644 --- 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