Skip to content

Commit 7ac4731

Browse files
committed
Android 35
1 parent 9e9154a commit 7ac4731

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

.github/workflows/android.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
4545
keyPassword: ${{ secrets.KEY_PASSWORD }}
4646
env:
47-
BUILD_TOOLS_VERSION: "34.0.0"
47+
BUILD_TOOLS_VERSION: "35.0.0"
4848
- name: upload
4949
uses: actions/upload-artifact@v3
5050
with:
@@ -56,10 +56,10 @@ jobs:
5656
uses: actions/checkout@v3
5757
with:
5858
fetch-depth: 0
59-
- name: set up JDK 17
59+
- name: set up JDK 21
6060
uses: actions/setup-java@v3
6161
with:
62-
java-version: '17'
62+
java-version: '21'
6363
distribution: 'temurin'
6464
cache: gradle
6565
- name: Grant execute permission for gradlew

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
4747
keyPassword: ${{ secrets.KEY_PASSWORD }}
4848
env:
49-
BUILD_TOOLS_VERSION: "34.0.0"
49+
BUILD_TOOLS_VERSION: "35.0.0"
5050
- name: play store
5151
uses: r0adkll/upload-google-play@v1
5252
with:

project/build.gradle

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ project.ext.set("archivesBaseName", "reversatile")
88
android {
99

1010

11-
compileSdk 34
12-
buildToolsVersion '34.0.0'
13-
11+
compileSdk 35
12+
buildToolsVersion '35.0.0'
1413
useLibrary 'android.test.base'
1514
useLibrary 'android.test.mock'
1615

@@ -22,7 +21,7 @@ android {
2221
abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
2322
}
2423
minSdkVersion 21
25-
targetSdkVersion 34
24+
targetSdkVersion 35
2625
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2726
}
2827

@@ -77,27 +76,27 @@ repositories {
7776
}
7877

7978
dependencies {
80-
api 'com.google.guava:guava:27.1-android'
79+
api 'com.google.guava:guava:33.3.1-android'
8180

82-
implementation 'androidx.appcompat:appcompat:1.6.1'
83-
implementation 'androidx.core:core:1.12.0'
84-
implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
81+
implementation 'androidx.appcompat:appcompat:1.7.0'
82+
implementation 'androidx.core:core:1.15.0'
83+
implementation 'androidx.vectordrawable:vectordrawable-animated:1.2.0'
8584
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
8685
implementation 'com.github.matomo-org:matomo-sdk-android:4.1.4'
87-
implementation 'org.apache.commons:commons-lang3:3.0'
86+
implementation 'org.apache.commons:commons-lang3:3.17.0'
8887

8988
implementation 'com.github.Innovattic:range-seek-bar:v1.0.6'
90-
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
89+
implementation(platform('org.jetbrains.kotlin:kotlin-bom:2.0.21'))
9190

9291
// Required -- JUnit 4 framework
93-
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
92+
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
9493
testImplementation 'junit:junit:4.13.2'
95-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
94+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
9695
// Optional -- Mockito framework
97-
testImplementation 'org.mockito:mockito-core:2.28.2'
98-
androidTestImplementation 'androidx.test:core:1.5.0'
99-
androidTestImplementation 'androidx.test:runner:1.5.2'
100-
androidTestImplementation 'androidx.test:rules:1.5.0'
96+
testImplementation 'org.mockito:mockito-core:5.14.2'
97+
androidTestImplementation 'androidx.test:core:1.6.1'
98+
androidTestImplementation 'androidx.test:runner:1.6.2'
99+
androidTestImplementation 'androidx.test:rules:1.6.1'
101100
// Optional -- Hamcrest library
102-
androidTestImplementation 'org.hamcrest:hamcrest-library:2.1'
101+
androidTestImplementation 'org.hamcrest:hamcrest-library:3.0'
103102
}

project/src/main/res/values/themes.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33

44
<!-- the theme applied to the application or activity -->
55
<style name="CustomActionBarTheme" parent="Theme.AppCompat">
6+
<item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
67
<item name="actionBarStyle">@style/MyActionBar</item>
7-
<item name="android:textColor">@color/statustextcolor</item>
8+
<item name="android:textColor">@color/statustextcolor</item>test
89
<item name="android:actionButtonStyle">@style/ActionButton</item>
910
</style>
1011

0 commit comments

Comments
 (0)