build: Fix build

This commit is contained in:
oSumAtrIX 2024-11-07 21:03:32 +01:00
parent c47c7c0a88
commit d99e5af384
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
6 changed files with 24 additions and 12 deletions

View File

@ -7,7 +7,7 @@ plugins {
android { android {
namespace = "app.revanced.manager.flutter" namespace = "app.revanced.manager.flutter"
compileSdk = 34 compileSdk = 35
ndkVersion = "27.0.12077973" ndkVersion = "27.0.12077973"
compileOptions { compileOptions {
@ -24,9 +24,11 @@ android {
defaultConfig { defaultConfig {
applicationId = "app.revanced.manager.flutter" applicationId = "app.revanced.manager.flutter"
minSdk = 26 minSdk = 26
targetSdk = 34 targetSdk = 35
versionCode = flutter.versionCode versionCode = flutter.versionCode
versionName = flutter.versionName versionName = flutter.versionName
resValue("string", "app_name", "ReVanced Manager")
} }
buildTypes { buildTypes {
@ -37,6 +39,7 @@ android {
signingConfig = signingConfigs["debug"] signingConfig = signingConfigs["debug"]
ndk.abiFilters += setOf("armeabi-v7a", "arm64-v8a", "x86_64") ndk.abiFilters += setOf("armeabi-v7a", "arm64-v8a", "x86_64")
setProperty("archivesBaseName", "revanced-manager-v${flutter.versionName}") setProperty("archivesBaseName", "revanced-manager-v${flutter.versionName}")
} }
@ -52,14 +55,16 @@ android {
keyAlias = System.getenv("KEYSTORE_ENTRY_ALIAS") keyAlias = System.getenv("KEYSTORE_ENTRY_ALIAS")
keyPassword = System.getenv("KEYSTORE_ENTRY_PASSWORD") keyPassword = System.getenv("KEYSTORE_ENTRY_PASSWORD")
} }
resValue("string", "app_name", "ReVanced Manager")
} else { } else {
resValue("string", "app_name", "ReVanced Manager (Debug)")
applicationIdSuffix = ".debug" applicationIdSuffix = ".debug"
signingConfig = signingConfigs["debug"] signingConfig = signingConfigs["debug"]
}
resValue("string", "app_name", "ReVanced Manager") resValue("string", "app_name", "ReVanced Manager (Debug)")
}
} }
debug { debug {
@ -80,6 +85,7 @@ android {
} }
} }
flutter { flutter {
source = "../.." source = "../.."
} }

View File

@ -3,7 +3,6 @@ package app.revanced.manager.flutter
import android.app.Activity import android.app.Activity
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.pm.PackageInfo
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.os.Bundle import android.os.Bundle
import android.util.Base64 import android.util.Base64
@ -17,9 +16,8 @@ import java.security.MessageDigest
class ExportSettingsActivity : Activity() { class ExportSettingsActivity : Activity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
val callingPackageName = getCallingPackage()!!
if (getFingerprint(callingPackageName) == getFingerprint(getPackageName())) { if (getFingerprint(callingPackage!!) == getFingerprint(packageName)) {
// Create JSON Object // Create JSON Object
val json = JSONObject() val json = JSONObject()
@ -64,7 +62,7 @@ class ExportSettingsActivity : Activity() {
fun getFingerprint(packageName: String): String { fun getFingerprint(packageName: String): String {
// Get the signature of the app that matches the package name // Get the signature of the app that matches the package name
val packageInfo = packageManager.getPackageInfo(packageName, PackageManager.GET_SIGNATURES) val packageInfo = packageManager.getPackageInfo(packageName, PackageManager.GET_SIGNATURES)
val signature = packageInfo.signatures[0] val signature = packageInfo.signatures!![0]
// Get the raw certificate data // Get the raw certificate data
val rawCert = signature.toByteArray() val rawCert = signature.toByteArray()

View File

@ -1,4 +1,5 @@
import com.android.build.api.dsl.CommonExtension import com.android.build.api.dsl.CommonExtension
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
allprojects { allprojects {
repositories { repositories {
@ -17,6 +18,14 @@ allprojects {
layout.buildDirectory = File("../build") layout.buildDirectory = File("../build")
project(":screenshot_callback") {
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = "17"
}
}
}
subprojects { subprojects {
afterEvaluate { afterEvaluate {
extensions.findByName("android")?.let { extensions.findByName("android")?.let {

View File

@ -3,6 +3,5 @@ android.useAndroidX=true
org.gradle.parallel=true org.gradle.parallel=true
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.caching=true org.gradle.caching=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false android.nonTransitiveRClass=false
android.nonFinalResIds=false android.nonFinalResIds=false

View File

@ -1,7 +1,7 @@
[versions] [versions]
revanced-patcher = "21.0.0" revanced-patcher = "21.0.0"
revanced-library = "3.0.2" revanced-library = "3.0.2"
desugar_jdk_libs = "2.1.2" desugar_jdk_libs = "2.1.3"
[libraries] [libraries]
revanced-patcher = { module = "app.revanced:revanced-patcher", version.ref = "revanced-patcher" } revanced-patcher = { module = "app.revanced:revanced-patcher", version.ref = "revanced-patcher" }

View File

@ -17,7 +17,7 @@ pluginManagement {
plugins { plugins {
id("dev.flutter.flutter-plugin-loader") version "1.0.0" id("dev.flutter.flutter-plugin-loader") version "1.0.0"
id("com.android.application") version "8.5.0" apply false id("com.android.application") version "8.7.2" apply false
id("org.jetbrains.kotlin.android") version "2.0.20" apply false id("org.jetbrains.kotlin.android") version "2.0.20" apply false
} }