letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #3776 from element-hq/feature/bma/targetApi35

Browse Source 
Target api 35
This commit is contained in:
Benoit Marty
2024-11-05 09:39:50 +01:00
committed by GitHub
parent 7170d9fc5b 6a1e9d0321
commit 6ea98d3d26
7 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle.kts
View File

@@ -48,9 +48,9 @@ android {
} else {
"io.element.android.x"
}
targetSdk = Versions.targetSdk
versionCode = Versions.versionCode
versionName = Versions.versionName
targetSdk = Versions.TARGET_SDK
versionCode = Versions.VERSION_CODE
versionName = Versions.VERSION_NAME
// Keep abiFilter for the universalApk
ndk {

1
features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenView.kt
View File

@@ -183,6 +183,7 @@ private fun WebView.setup(
allowFileAccess = true
domStorageEnabled = true
mediaPlaybackRequiresUserGesture = false
@Suppress("DEPRECATION")
databaseEnabled = true
loadsImagesAutomatically = true
userAgentString = userAgent

2
features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareService.kt
View File

@@ -46,7 +46,7 @@ class DefaultShareService @Inject constructor(
PackageManager.GET_ACTIVITIES or PackageManager.MATCH_DISABLED_COMPONENTS
)
.activities
.firstOrNull { it.name.endsWith(".ShareActivity") }
?.firstOrNull { it.name.endsWith(".ShareActivity") }
?.let { shareActivityInfo ->
ComponentName(
shareActivityInfo.packageName,

1
libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcView.kt
View File

@@ -86,6 +86,7 @@ fun OidcView(
javaScriptEnabled = true
allowContentAccess = true
allowFileAccess = true
@Suppress("DEPRECATION")
databaseEnabled = true
domStorageEnabled = true
}

8
plugins/src/main/kotlin/Versions.kt
View File

@@ -50,10 +50,10 @@ private const val versionMinor = 7
private const val versionPatch = 3
object Versions {
val versionCode = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch
val versionName = "$versionMajor.$versionMinor.$versionPatch"
const val compileSdk = 34
const val targetSdk = 34
const val VERSION_CODE = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch
const val VERSION_NAME = "$versionMajor.$versionMinor.$versionPatch"
const val COMPILE_SDK = 35
const val TARGET_SDK = 35
// When updating the `minSdk`, make sure to update the value of `minSdkVersion` in the file `tools/release/release.sh`
val minSdk = if (isEnterpriseBuild) 26 else 24

2
plugins/src/main/kotlin/extension/CommonExtension.kt
View File

@@ -15,7 +15,7 @@ import java.io.File
fun CommonExtension<*, *, *, *, *, *>.androidConfig(project: Project) {
defaultConfig {
compileSdk = Versions.compileSdk
compileSdk = Versions.COMPILE_SDK
minSdk = Versions.minSdk
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

6
samples/minimal/build.gradle.kts
View File

@@ -14,9 +14,9 @@ android {
defaultConfig {
applicationId = "io.element.android.samples.minimal"
targetSdk = Versions.targetSdk
versionCode = Versions.versionCode
versionName = Versions.versionName
targetSdk = Versions.TARGET_SDK
versionCode = Versions.VERSION_CODE
versionName = Versions.VERSION_NAME
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}