From d6fc940f80bb035ab2820d2db6e43cea28f7a377 Mon Sep 17 00:00:00 2001
From: NekoInverter <7741672-NekoInverter@users.noreply.gitlab.com>
Date: Mon, 25 Jan 2021 20:38:52 +0800
Subject: [PATCH] Use AndroidX

---
 edxp-core/build.gradle                                        | 2 +-
 .../java/com/elderdrivers/riru/edxp/core/BaseEdxpImpl.java    | 2 +-
 .../main/java/com/elderdrivers/riru/edxp/core/EdxpImpl.java   | 4 ++--
 gradle.properties                                             | 4 +++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/edxp-core/build.gradle b/edxp-core/build.gradle
index c26adffc..712fe618 100644
--- a/edxp-core/build.gradle
+++ b/edxp-core/build.gradle
@@ -38,7 +38,7 @@ dependencies {
     implementation 'rikka.ndk:riru:10'
     implementation project(path: ':sandhook-hooklib')
     compileOnly project(':hiddenapi-stubs')
-    compileOnly 'com.android.support:support-annotations:28.0.0'
+    compileOnly 'androidx.annotation:annotation:1.1.0'
 }
 
 android {
diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/BaseEdxpImpl.java b/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/BaseEdxpImpl.java
index 8d2101d0..4d97cad8 100644
--- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/BaseEdxpImpl.java
+++ b/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/BaseEdxpImpl.java
@@ -1,6 +1,6 @@
 package com.elderdrivers.riru.edxp.core;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.elderdrivers.riru.edxp.proxy.NormalProxy;
 import com.elderdrivers.riru.edxp.proxy.Router;
diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/EdxpImpl.java b/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/EdxpImpl.java
index 236a46cb..acaa4144 100644
--- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/EdxpImpl.java
+++ b/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/EdxpImpl.java
@@ -1,7 +1,7 @@
 package com.elderdrivers.riru.edxp.core;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
 
 import com.elderdrivers.riru.common.KeepAll;
 import com.elderdrivers.riru.edxp.proxy.Router;
diff --git a/gradle.properties b/gradle.properties
index ffc61d55..eb493a1a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,6 @@ androidMinSdkVersion=26
 androidTargetSdkVersion=30
 androidCompileNdkVersion=22.0.7026061
 android.prefabVersion=1.1.2
-apiCode=93
\ No newline at end of file
+apiCode=93
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file