From 6c5d4defa0543b24b58b9d552b2461dee47f6bfa Mon Sep 17 00:00:00 2001 From: "Syuugo (Inspection)" <112163166+s1204-inspect@users.noreply.github.com> Date: Mon, 17 Mar 2025 10:20:14 +0900 Subject: [PATCH 1/2] Use AndroidX --- gradle.properties | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index a01023fe..31e42341 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,10 @@ +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +org.gradle.configuration-cache=true + android.nonTransitiveRClass=true android.nonFinalResIds=false android.enableR8.fullMode=true +android.useAndroidX=true +android.enableJetifier=true android.experimental.enableNewResourceShrinker=true android.experimental.enableNewResourceShrinker.preciseShrinking=true -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -org.gradle.configuration-cache=true From 0db6624c5ae3cf997343c836e804ed2a3e0e475d Mon Sep 17 00:00:00 2001 From: Syuugo Date: Mon, 17 Mar 2025 10:28:05 +0900 Subject: [PATCH 2/2] Use AndroidX --- app/build.gradle | 3 +-- app/src/main/java/io/github/chipppppppppp/lime/Main.java | 3 ++- .../io/github/chipppppppppp/lime/hooks/RedirectWebView.java | 4 +++- gradle.properties | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5810c676..46d116d5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -68,8 +68,7 @@ android { dependencies { compileOnly 'de.robv.android.xposed:api:82' - //noinspection GradleCompatible - implementation 'com.android.support:customtabs:23.0.0' + implementation 'androidx.browser:browser:1.8.0' implementation 'org.mozilla:rhino:1.8.0' } diff --git a/app/src/main/java/io/github/chipppppppppp/lime/Main.java b/app/src/main/java/io/github/chipppppppppp/lime/Main.java index 39f311f9..e0a41e3e 100644 --- a/app/src/main/java/io/github/chipppppppppp/lime/Main.java +++ b/app/src/main/java/io/github/chipppppppppp/lime/Main.java @@ -1,7 +1,8 @@ package io.github.chipppppppppp.lime; import android.content.res.XModuleResources; -import android.support.annotation.NonNull; + +import androidx.annotation.NonNull; import de.robv.android.xposed.IXposedHookInitPackageResources; import de.robv.android.xposed.IXposedHookLoadPackage; diff --git a/app/src/main/java/io/github/chipppppppppp/lime/hooks/RedirectWebView.java b/app/src/main/java/io/github/chipppppppppp/lime/hooks/RedirectWebView.java index b838073f..526d25b5 100644 --- a/app/src/main/java/io/github/chipppppppppp/lime/hooks/RedirectWebView.java +++ b/app/src/main/java/io/github/chipppppppppp/lime/hooks/RedirectWebView.java @@ -3,14 +3,16 @@ import android.app.Activity; import android.content.Intent; import android.net.Uri; -import android.support.customtabs.CustomTabsIntent; import android.view.View; import android.view.ViewGroup; import android.webkit.WebView; +import androidx.browser.customtabs.CustomTabsIntent; + import de.robv.android.xposed.XC_MethodHook; import de.robv.android.xposed.XposedHelpers; import de.robv.android.xposed.callbacks.XC_LoadPackage; + import io.github.chipppppppppp.lime.LimeOptions; public class RedirectWebView implements IHook { diff --git a/gradle.properties b/gradle.properties index 31e42341..ac07d1f6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,6 +5,6 @@ android.nonTransitiveRClass=true android.nonFinalResIds=false android.enableR8.fullMode=true android.useAndroidX=true -android.enableJetifier=true +#android.enableJetifier=true android.experimental.enableNewResourceShrinker=true android.experimental.enableNewResourceShrinker.preciseShrinking=true