Skip to content

Commit a1c36d9

Browse files
authored
Merge pull request #5150 from element-hq/feature/bma/sdk36
Compile and target sdk36
2 parents e0bc484 + 42e8596 commit a1c36d9

File tree

2,626 files changed

+5237
-5235
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,626 files changed

+5237
-5235
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ captures/
4747
.idea/compiler.xml
4848
.idea/deploymentTargetDropDown.xml
4949
.idea/deploymentTargetSelector.xml
50+
.idea/deviceManager.xml
5051
.idea/gradle.xml
5152
.idea/jarRepositories.xml
5253
.idea/misc.xml

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<application
1414
android:name=".ElementXApplication"
1515
android:allowBackup="false"
16+
android:appCategory="social"
1617
android:dataExtractionRules="@xml/data_extraction_rules"
1718
android:enableOnBackInvokedCallback="true"
1819
android:fullBackupContent="@xml/backup_rules"

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ ktlint = "org.jlleitschuh.gradle.ktlint:13.0.0"
244244
dependencygraph = "com.savvasdalkitsis.module-dependency-graph:0.12"
245245
dependencycheck = "org.owasp.dependencycheck:12.1.3"
246246
dependencyanalysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" }
247-
paparazzi = "app.cash.paparazzi:1.3.5"
247+
paparazzi = "app.cash.paparazzi:2.0.0-alpha02"
248248
sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
249249
firebaseAppDistribution = { id = "com.google.firebase.appdistribution", version.ref = "firebaseAppDistribution" }
250250
knit = { id = "org.jetbrains.kotlinx.knit", version = "0.5.0" }

plugins/src/main/kotlin/Versions.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ object Versions {
3838
const val VERSION_CODE = (2000 + versionYear) * 10_000 + versionMonth * 100 + versionReleaseNumber
3939
val VERSION_NAME = "$versionYear.${versionMonth.toString().padStart(2, '0')}.$versionReleaseNumber"
4040

41-
const val COMPILE_SDK = 35
42-
const val TARGET_SDK = 35
41+
const val COMPILE_SDK = 36
42+
const val TARGET_SDK = 36
4343

4444
// When updating the `minSdk`, make sure to update the value of `minSdkVersion` in the file `tools/release/release.sh`
4545
private const val MIN_SDK_FOSS = 24
Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions

0 commit comments

Comments
 (0)