From fd3e495e418716721c4835f725f8a7efe13c0a7c Mon Sep 17 00:00:00 2001
From: Nullptr <noreply@nullptr.icu>
Date: Wed, 11 Jan 2023 12:08:21 +0800
Subject: [PATCH] Fix release build

---
 gradle.properties                                           | 1 +
 interface/build.gradle.kts                                  | 2 +-
 interface/src/main/AndroidManifest.xml                      | 2 --
 service/build.gradle.kts                                    | 2 +-
 service/src/main/AndroidManifest.xml                        | 2 --
 .../io/github/libxposed/service/XposedServiceHelper.java    | 6 ++++--
 6 files changed, 7 insertions(+), 8 deletions(-)
 delete mode 100644 interface/src/main/AndroidManifest.xml
 delete mode 100644 service/src/main/AndroidManifest.xml

diff --git a/gradle.properties b/gradle.properties
index 5bac8ac..78a36aa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,2 @@
+android.enableR8.fullMode=true
 android.useAndroidX=true
diff --git a/interface/build.gradle.kts b/interface/build.gradle.kts
index be52544..79aec07 100644
--- a/interface/build.gradle.kts
+++ b/interface/build.gradle.kts
@@ -15,8 +15,8 @@ android {
     }
 
     buildFeatures {
-        androidResources = false
         buildConfig = false
+        resValues = false
     }
 
     compileOptions {
diff --git a/interface/src/main/AndroidManifest.xml b/interface/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee0..0000000
--- a/interface/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/service/build.gradle.kts b/service/build.gradle.kts
index 629caa8..87fb8e9 100644
--- a/service/build.gradle.kts
+++ b/service/build.gradle.kts
@@ -15,8 +15,8 @@ android {
     }
 
     buildFeatures {
-        androidResources = false
         buildConfig = false
+        resValues = false
     }
 
     buildTypes {
diff --git a/service/src/main/AndroidManifest.xml b/service/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee0..0000000
--- a/service/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/service/src/main/java/io/github/libxposed/service/XposedServiceHelper.java b/service/src/main/java/io/github/libxposed/service/XposedServiceHelper.java
index 071ada3..584930b 100644
--- a/service/src/main/java/io/github/libxposed/service/XposedServiceHelper.java
+++ b/service/src/main/java/io/github/libxposed/service/XposedServiceHelper.java
@@ -3,6 +3,8 @@ package io.github.libxposed.service;
 import android.os.IBinder;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import java.util.HashSet;
 import java.util.Set;
 
@@ -16,12 +18,12 @@ public final class XposedServiceHelper {
          *
          * @param service Service instance
          */
-        void onServiceBind(XposedService service);
+        void onServiceBind(@NonNull XposedService service);
 
         /**
          * Callback when the service is dead
          */
-        void onServiceDied(XposedService service);
+        void onServiceDied(@NonNull XposedService service);
     }
 
     private static final String TAG = "XposedServiceHelper";