Upgrade AGP
This commit is contained in:
parent
cf7bf655bb
commit
b277416c1d
|
|
@ -65,7 +65,7 @@ jobs:
|
||||||
echo 'org.gradle.vfs.watch=true' >> gradle.properties
|
echo 'org.gradle.vfs.watch=true' >> gradle.properties
|
||||||
echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties
|
echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties
|
||||||
echo 'android.native.buildOutput=verbose' >> gradle.properties
|
echo 'android.native.buildOutput=verbose' >> gradle.properties
|
||||||
sed -i 's/org.gradle.unsafe.configuration-cache=true//g' gradle.properties
|
sed -i 's/org.gradle.configuration-cache=true//g' gradle.properties
|
||||||
./gradlew zipAll
|
./gradlew zipAll
|
||||||
|
|
||||||
- name: Prepare artifact
|
- name: Prepare artifact
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@ android {
|
||||||
buildConfigField("long", "BUILD_TIME", Instant.now().epochSecond.toString())
|
buildConfigField("long", "BUILD_TIME", Instant.now().epochSecond.toString())
|
||||||
}
|
}
|
||||||
|
|
||||||
packagingOptions {
|
packaging {
|
||||||
resources {
|
resources {
|
||||||
excludes += "META-INF/**"
|
excludes += "META-INF/**"
|
||||||
excludes += "okhttp3/**"
|
excludes += "okhttp3/**"
|
||||||
|
|
|
||||||
|
|
@ -126,7 +126,7 @@ public class AppListFragment extends BaseFragment implements MenuProvider {
|
||||||
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
|
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
|
||||||
super.onViewCreated(view, savedInstanceState);
|
super.onViewCreated(view, savedInstanceState);
|
||||||
if (module == null) {
|
if (module == null) {
|
||||||
if (!safeNavigate(AppListFragmentDirections.actionAppListFragmentToModulesFragment())) {
|
if (!safeNavigate(R.id.action_app_list_fragment_to_modules_fragment)) {
|
||||||
safeNavigate(R.id.modules_nav);
|
safeNavigate(R.id.modules_nav);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@ plugins {
|
||||||
alias(libs.plugins.lsplugin.jgit)
|
alias(libs.plugins.lsplugin.jgit)
|
||||||
alias(libs.plugins.agp.lib) apply false
|
alias(libs.plugins.agp.lib) apply false
|
||||||
alias(libs.plugins.agp.app) apply false
|
alias(libs.plugins.agp.app) apply false
|
||||||
|
alias(libs.plugins.nav.safeargs) apply false
|
||||||
}
|
}
|
||||||
|
|
||||||
cmaker {
|
cmaker {
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,7 @@ android {
|
||||||
|
|
||||||
buildFeatures {
|
buildFeatures {
|
||||||
androidResources = false
|
androidResources = false
|
||||||
|
buildConfig = true
|
||||||
}
|
}
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@ val defaultManagerPackageName: String by rootProject.extra
|
||||||
android {
|
android {
|
||||||
buildFeatures {
|
buildFeatures {
|
||||||
prefab = true
|
prefab = true
|
||||||
|
buildConfig = true
|
||||||
}
|
}
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,4 @@
|
||||||
android.experimental.enableNewResourceShrinker=true
|
android.experimental.enableNewResourceShrinker=true
|
||||||
android.experimental.enableNewResourceShrinker.preciseShrinking=true
|
android.experimental.enableNewResourceShrinker.preciseShrinking=true
|
||||||
android.enableAppCompileTimeRClass=true
|
android.enableAppCompileTimeRClass=true
|
||||||
android.nonTransitiveRClass=true
|
|
||||||
android.enableR8.fullMode=true
|
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
[versions]
|
[versions]
|
||||||
agp = "7.4.2"
|
agp = "8.0.0"
|
||||||
kotlin = "1.8.20"
|
kotlin = "1.8.20"
|
||||||
nav = "2.5.3"
|
nav = "2.5.3"
|
||||||
appcenter = "5.0.1"
|
appcenter = "5.0.1"
|
||||||
|
|
@ -16,7 +16,7 @@ autoresconfig = { id = "dev.rikka.tools.autoresconfig", version = "1.2.2" }
|
||||||
materialthemebuilder = { id = "dev.rikka.tools.materialthemebuilder", version = "1.3.3" }
|
materialthemebuilder = { id = "dev.rikka.tools.materialthemebuilder", version = "1.3.3" }
|
||||||
lsplugin-resopt = { id = "org.lsposed.lsplugin.resopt", version = "1.5" }
|
lsplugin-resopt = { id = "org.lsposed.lsplugin.resopt", version = "1.5" }
|
||||||
lsplugin-apksign = { id = "org.lsposed.lsplugin.apksign", version = "1.1" }
|
lsplugin-apksign = { id = "org.lsposed.lsplugin.apksign", version = "1.1" }
|
||||||
lsplugin-cmaker = { id = "org.lsposed.lsplugin.cmaker", version = "1.0" }
|
lsplugin-cmaker = { id = "org.lsposed.lsplugin.cmaker", version = "1.1" }
|
||||||
lsplugin-jgit = { id = "org.lsposed.lsplugin.jgit", version = "1.0" }
|
lsplugin-jgit = { id = "org.lsposed.lsplugin.jgit", version = "1.0" }
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
|
|
|
||||||
|
|
@ -59,6 +59,7 @@ android {
|
||||||
|
|
||||||
buildFeatures {
|
buildFeatures {
|
||||||
prefab = true
|
prefab = true
|
||||||
|
buildConfig = true
|
||||||
}
|
}
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,10 @@ plugins {
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
buildFeatures {
|
||||||
|
aidl = true
|
||||||
|
}
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
consumerProguardFiles("proguard-rules.pro")
|
consumerProguardFiles("proguard-rules.pro")
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,8 +24,6 @@ import android.os.SystemProperties;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import org.lsposed.lspd.daemonservice.BuildConfig;
|
|
||||||
|
|
||||||
import java.time.ZoneId;
|
import java.time.ZoneId;
|
||||||
import java.time.ZoneOffset;
|
import java.time.ZoneOffset;
|
||||||
import java.time.zone.ZoneRulesException;
|
import java.time.zone.ZoneRulesException;
|
||||||
|
|
@ -37,13 +35,11 @@ public class Utils {
|
||||||
public static final boolean isLENOVO = !TextUtils.isEmpty(SystemProperties.get("ro.lenovo.region"));
|
public static final boolean isLENOVO = !TextUtils.isEmpty(SystemProperties.get("ro.lenovo.region"));
|
||||||
|
|
||||||
public static void logD(Object msg) {
|
public static void logD(Object msg) {
|
||||||
if (BuildConfig.DEBUG)
|
Log.d(LOG_TAG, msg.toString());
|
||||||
Log.d(LOG_TAG, msg.toString());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void logD(String msg, Throwable throwable) {
|
public static void logD(String msg, Throwable throwable) {
|
||||||
if (BuildConfig.DEBUG)
|
Log.d(LOG_TAG, msg, throwable);
|
||||||
Log.d(LOG_TAG, msg, throwable);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void logW(String msg) {
|
public static void logW(String msg) {
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,10 @@ plugins {
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
buildFeatures {
|
||||||
|
aidl = true
|
||||||
|
}
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
consumerProguardFiles("proguard-rules.pro")
|
consumerProguardFiles("proguard-rules.pro")
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue