Skip to content

Commit 52b3012

Browse files
authored
Merge pull request #444 from opendocument-app/update-511
Update core, gradle and SDK
2 parents 774494a + 4519852 commit 52b3012

File tree

5 files changed

+18
-5
lines changed

5 files changed

+18
-5
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ android {
3131
defaultConfig {
3232
applicationId "at.tomtasche.reader"
3333
minSdkVersion 23
34-
compileSdkVersion 34
35-
targetSdkVersion 34
34+
compileSdkVersion 35
35+
targetSdkVersion 35
3636

3737
testApplicationId "at.tomtasche.reader.test"
3838
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/conanfile.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[requires]
2-
odrcore/5.0.7
2+
odrcore/5.1.1
33

44
[generators]
55
CMakeToolchain
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
4+
<style name="MainTheme" parent="Theme.AppCompat.Light">
5+
<item name="colorPrimary">#ffffff</item>
6+
<item name="colorPrimaryDark">#6b6b6b</item>
7+
<item name="colorAccent">#b5b5b5</item>
8+
<item name="android:textColorPrimary">#6b6b6b</item>
9+
<item name="android:textColorSecondary">#b5b5b5</item>
10+
<item name="android:forceDarkAllowed">true</item>
11+
<item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
12+
</style>
13+
</resources>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'com.android.application' version '8.5.2' apply false
2+
id 'com.android.application' version '8.13.1' apply false
33
id 'com.google.gms.google-services'version '4.4.2' apply false
44
id 'com.google.firebase.crashlytics' version '3.0.2' apply false
55
id 'app.opendocument.conanandroidgradleplugin' version '0.9.6' apply false

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)