gradle: target API 36
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
@@ -11,7 +11,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdk = 34
|
compileSdk = 36
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility = JavaVersion.VERSION_17
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
targetCompatibility = JavaVersion.VERSION_17
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
|
|||||||
+2
-2
@@ -12,7 +12,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdk = 34
|
compileSdk = 36
|
||||||
buildFeatures {
|
buildFeatures {
|
||||||
buildConfig = true
|
buildConfig = true
|
||||||
dataBinding = true
|
dataBinding = true
|
||||||
@@ -22,7 +22,7 @@ android {
|
|||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId = pkg
|
applicationId = pkg
|
||||||
minSdk = 21
|
minSdk = 21
|
||||||
targetSdk = 34
|
targetSdk = 36
|
||||||
versionCode = providers.gradleProperty("wireguardVersionCode").get().toInt()
|
versionCode = providers.gradleProperty("wireguardVersionCode").get().toInt()
|
||||||
versionName = providers.gradleProperty("wireguardVersionName").get()
|
versionName = providers.gradleProperty("wireguardVersionName").get()
|
||||||
buildConfigField("int", "MIN_SDK_VERSION", minSdk.toString())
|
buildConfigField("int", "MIN_SDK_VERSION", minSdk.toString())
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ class AppListDialogFragment : DialogFragment() {
|
|||||||
val packageInfos = getPackagesHoldingPermissions(pm, arrayOf(Manifest.permission.INTERNET))
|
val packageInfos = getPackagesHoldingPermissions(pm, arrayOf(Manifest.permission.INTERNET))
|
||||||
packageInfos.forEach {
|
packageInfos.forEach {
|
||||||
val packageName = it.packageName
|
val packageName = it.packageName
|
||||||
val appInfo = it.applicationInfo
|
val appInfo = it.applicationInfo ?: return@forEach
|
||||||
val appData =
|
val appData =
|
||||||
ApplicationData(appInfo.loadIcon(pm), appInfo.loadLabel(pm).toString(), packageName, currentlySelectedApps.contains(packageName))
|
ApplicationData(appInfo.loadIcon(pm), appInfo.loadLabel(pm).toString(), packageName, currentlySelectedApps.contains(packageName))
|
||||||
applicationData.add(appData)
|
applicationData.add(appData)
|
||||||
|
|||||||
@@ -376,12 +376,12 @@ object Updater {
|
|||||||
if (installerIsGooglePlay(context))
|
if (installerIsGooglePlay(context))
|
||||||
return
|
return
|
||||||
|
|
||||||
if (!if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
|
if (if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
|
||||||
@Suppress("DEPRECATION")
|
@Suppress("DEPRECATION")
|
||||||
context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_PERMISSIONS)
|
context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_PERMISSIONS)
|
||||||
} else {
|
} else {
|
||||||
context.packageManager.getPackageInfo(context.packageName, PackageManager.PackageInfoFlags.of(PackageManager.GET_PERMISSIONS.toLong()))
|
context.packageManager.getPackageInfo(context.packageName, PackageManager.PackageInfoFlags.of(PackageManager.GET_PERMISSIONS.toLong()))
|
||||||
}.requestedPermissions.contains(Manifest.permission.REQUEST_INSTALL_PACKAGES)
|
}.requestedPermissions?.contains(Manifest.permission.REQUEST_INSTALL_PACKAGES) != true
|
||||||
) {
|
) {
|
||||||
if (installer(context).isNotEmpty()) {
|
if (installer(context).isNotEmpty()) {
|
||||||
updaterScope.launch {
|
updaterScope.launch {
|
||||||
|
|||||||
Reference in New Issue
Block a user