commit 4e460ed2be58f8d3d70fa281c1a804013e037659
parent 80e1895355ae28e6ec24da1705765bfda5876a0a
Author: Caner Karaca <37447503+CanerKaraca23@users.noreply.github.com>
Date: Wed, 8 May 2024 15:13:44 +0300
chore: update dependencies (#964)
---------
Co-authored-by: rhunk <101876869+rhunk@users.noreply.github.com>
Diffstat:
12 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
@@ -192,5 +192,4 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: core
- path: app/build/outputs/apk/core/debug/*.apk
-
+ path: app/build/outputs/apk/core/debug/*.apk+
\ No newline at end of file
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -188,5 +188,4 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: core
- path: app/build/outputs/apk/core/debug/*.apk
-
+ path: app/build/outputs/apk/core/debug/*.apk+
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -225,6 +225,4 @@ jobs:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: ${{ inputs.prerelease }}
files: bins/*.apk
- automatic_release_tag: v${{ env.version }}
-
-
+ automatic_release_tag: v${{ env.version }}+
\ No newline at end of file
diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/setup/screens/impl/PermissionsScreen.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/setup/screens/impl/PermissionsScreen.kt
@@ -2,6 +2,7 @@ package me.rhunk.snapenhance.ui.setup.screens.impl
import android.Manifest
import android.annotation.SuppressLint
+import android.app.Activity
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
@@ -9,7 +10,6 @@ import android.net.Uri
import android.os.Build
import android.os.PowerManager
import android.provider.Settings
-import androidx.activity.ComponentActivity
import androidx.compose.foundation.layout.*
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Check
@@ -81,7 +81,7 @@ class PermissionsScreen : SetupScreen() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
activityLauncherHelper.requestPermission(Manifest.permission.POST_NOTIFICATIONS) { resultCode, _ ->
coroutineScope.launch {
- grantedPermissions[perm.translationKey] = resultCode == ComponentActivity.RESULT_OK
+ grantedPermissions[perm.translationKey] = resultCode == Activity.RESULT_OK
}
}
}
diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/util/ActivityLauncherHelper.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/util/ActivityLauncherHelper.kt
@@ -1,5 +1,6 @@
package me.rhunk.snapenhance.ui.util
+import android.app.Activity
import android.content.Intent
import androidx.activity.ComponentActivity
import androidx.activity.result.ActivityResultLauncher
@@ -15,7 +16,7 @@ class ActivityLauncherHelper(
private var permissionResultLauncher: ActivityResultLauncher<String> =
activity.registerForActivityResult(ActivityResultContracts.RequestPermission()) { result ->
runCatching {
- callback?.let { it(if (result) ComponentActivity.RESULT_OK else ComponentActivity.RESULT_CANCELED, null) }
+ callback?.let { it(if (result) Activity.RESULT_OK else Activity.RESULT_CANCELED, null) }
}.onFailure {
AbstractLogger.directError("Failed to process activity result", it)
}
@@ -55,7 +56,7 @@ fun ActivityLauncherHelper.chooseFolder(callback: (uri: String) -> Unit) {
.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
) { resultCode, intent ->
- if (resultCode != ComponentActivity.RESULT_OK) {
+ if (resultCode != Activity.RESULT_OK) {
return@launch
}
val uri = intent?.data ?: return@launch
@@ -77,7 +78,7 @@ fun ActivityLauncherHelper.saveFile(name: String, type: String = "*/*", callback
.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
) { resultCode, intent ->
- if (resultCode != ComponentActivity.RESULT_OK) {
+ if (resultCode != Activity.RESULT_OK) {
return@launch
}
val uri = intent?.data ?: return@launch
@@ -97,7 +98,7 @@ fun ActivityLauncherHelper.openFile(type: String = "*/*", callback: (uri: String
.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
) { resultCode, intent ->
- if (resultCode != ComponentActivity.RESULT_OK) {
+ if (resultCode != Activity.RESULT_OK) {
return@launch
}
val uri = intent?.data ?: return@launch
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,33 +1,29 @@
[versions]
agp = "8.2.2"
-apksig = "8.2.2"
colorpicker-compose = "1.0.7"
libsu = "5.2.2"
-guava = "33.0.0-jre"
+guava = "33.2.0-jre"
jsoup = "1.17.2"
-kotlin = "1.9.22"
+kotlin = "1.9.23"
kotlinx-coroutines-android = "1.8.0"
-compose-compiler = "1.5.9"
-
-activity-ktx = "1.8.2"
+compose-compiler = "1.5.13"
+activity-ktx = "1.9.0"
androidx-documentfile = "1.1.0-alpha01"
-coil-compose = "2.5.0"
+coil-compose = "2.6.0"
navigation-compose = "2.7.7"
osmdroid-android = "6.1.18"
recyclerview = "1.3.2"
-
-compose-bom = "2024.02.01"
-bcprov-jdk18on = "1.77"
+compose-bom = "2024.05.00" # make sure all ui components are fully working after updating this
+bcprov-jdk18on = "1.78.1"
dexlib2 = "3.0.5"
ffmpeg-kit = "6.0-2.LTS"
gson = "2.10.1"
junit = "5.10.2"
-material3 = "1.2.0"
-okhttp = "5.0.0-alpha.12"
-rhino = "1.7.14"
+material3 = "1.2.1"
+okhttp = "5.0.0-alpha.14"
+rhino = "1.7.15"
rhino-android = "1.6.0"
-
[libraries]
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "activity-ktx" }
@@ -39,7 +35,7 @@ androidx-material-ripple = { module = "androidx.compose.material:material-ripple
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigation-compose" }
androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
-apksig = { module = "com.android.tools.build:apksig", version.ref = "apksig" }
+apksig = { module = "com.android.tools.build:apksig", version.ref = "agp" }
bcprov-jdk18on = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bcprov-jdk18on" }
coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil-compose" }
coil-video = { module = "io.coil-kt:coil-video", version.ref = "coil-compose" }
@@ -58,11 +54,10 @@ recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version
rhino = { module = "org.mozilla:rhino", version.ref = "rhino" }
rhino-android = { group = "com.faendir.rhino", name = "rhino-android", version.ref = "rhino-android" }
-
[plugins]
androidApplication = { id = "com.android.application", version.ref = "agp" }
androidLibrary = { id = "com.android.library", version.ref = "agp" }
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-[bundles]-
\ No newline at end of file
+[bundles]
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
Binary files differ.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists+
\ No newline at end of file
diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts
@@ -21,13 +21,6 @@ android {
defaultConfig {
buildConfigField("String", "APPLICATION_ID", "\"${rootProject.ext["applicationId"]}\"")
- }
-
- composeOptions {
- kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
- }
-
- defaultConfig {
applicationId = rootProject.ext["applicationId"].toString() + ".manager"
versionCode = 1
versionName = "1.0.0"
@@ -36,6 +29,10 @@ android {
multiDexEnabled = true
}
+ composeOptions {
+ kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
+ }
+
buildTypes {
release {
isMinifyEnabled = true
diff --git a/manager/src/main/kotlin/me/rhunk/snapenhance/manager/ui/tab/impl/download/InstallPackageTab.kt b/manager/src/main/kotlin/me/rhunk/snapenhance/manager/ui/tab/impl/download/InstallPackageTab.kt
@@ -1,5 +1,6 @@
package me.rhunk.snapenhance.manager.ui.tab.impl.download
+import android.app.Activity
import android.content.Intent
import android.net.Uri
import android.widget.Toast
@@ -174,7 +175,7 @@ class InstallPackageTab : Tab("install_app") {
return
}
installPackageCallback = resultCallbacks@{ code ->
- installStage = if (code != ComponentActivity.RESULT_OK) {
+ installStage = if (code != Activity.RESULT_OK) {
InstallStage.ERROR
} else {
InstallStage.DONE
@@ -208,7 +209,7 @@ class InstallPackageTab : Tab("install_app") {
putExtra(Intent.EXTRA_RETURN_RESULT, true)
}
uninstallPackageCallback = resultCallback@{ resultCode ->
- if (resultCode != ComponentActivity.RESULT_OK) {
+ if (resultCode != Activity.RESULT_OK) {
installStage = InstallStage.ERROR
downloadedFile?.delete()
return@resultCallback
diff --git a/mapper/build.gradle.kts b/mapper/build.gradle.kts
@@ -15,6 +15,10 @@ android {
kotlinOptions {
jvmTarget = "17"
}
+
+ defaultConfig {
+ minSdk = 28
+ }
}
dependencies {
diff --git a/native/build.gradle.kts b/native/build.gradle.kts
@@ -8,6 +8,8 @@ val nativeName = rootProject.ext.get("buildHash")
android {
namespace = rootProject.ext["applicationId"].toString() + ".nativelib"
compileSdk = 34
+ buildToolsVersion = "34.0.0"
+ ndkVersion = "26.3.11579264"
buildFeatures {
buildConfig = true
@@ -34,6 +36,7 @@ android {
?: listOf("arm64-v8a", "armeabi-v7a")
}
}
+ minSdk = 28
}
externalNativeBuild {
