Skip to content

Commit 9f93f93

Browse files
authored
Merge pull request #9800 from thunderbird/dependabot/gradle/org.robolectric-robolectric-4.16
chore(deps): bump org.robolectric:robolectric from 4.15.1 to 4.16
2 parents eefc08d + 2d9c4dd commit 9f93f93

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

.github/actions/setup/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ runs:
1111
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
1212
with:
1313
distribution: 'temurin'
14-
java-version: '17'
14+
java-version: '21'
1515

1616
- name: Set up Gradle
1717
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
3333
with:
3434
distribution: 'temurin'
35-
java-version: '17'
35+
java-version: '21'
3636

3737
- name: Setup Gradle
3838
uses: gradle/actions/setup-gradle@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # v4.4.4

.github/workflows/markdown.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2929
with:
3030
distribution: 'temurin'
31-
java-version: '17'
31+
java-version: '21'
3232

3333
- name: Setup Gradle
3434
uses: gradle/actions/setup-gradle@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # v4.4.4

.github/workflows/shippable_builds.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ jobs:
229229
if: ${{ contains(matrix.releaseTarget, 'github') || needs.dump_config.outputs.releaseType == 'daily' }}
230230
with:
231231
distribution: 'temurin'
232-
java-version: '17'
232+
java-version: '21'
233233

234234
- name: Setup Gradle
235235
uses: gradle/actions/setup-gradle@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # v4.4.4
@@ -477,7 +477,7 @@ jobs:
477477
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
478478
with:
479479
distribution: 'temurin'
480-
java-version: '17'
480+
java-version: '21'
481481

482482
- name: Setup Gradle
483483
uses: gradle/actions/setup-gradle@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # v4.4.4

docs/contributing/development-environment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Android project.
77

88
Before you begin, ensure you have the following installed:
99

10-
- **[Java Development Kit (JDK)](https://adoptium.net/temurin/releases/?version=17)** - Version 17 or higher (Temurin OpenJDK recommended)
10+
- **[Java Development Kit (JDK)](https://adoptium.net/temurin/releases/?version=21)** - Version 21 or higher (Temurin OpenJDK recommended)
1111
- **[Android Studio](https://developer.android.com/studio)** - Latest stable version recommended
1212
- **[Git](https://git-scm.com/downloads)** - For version control
1313
- **Gradle** - Use the Gradle wrapper included in this repo (`./gradlew`); no separate install required

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ mozillaAndroidComponents = "143.0.2"
102102
okhttp = "5.1.0"
103103
okio = "3.16.0"
104104
preferencesFix = "1.1.0"
105-
robolectric = "4.15.1"
105+
robolectric = "4.16"
106106
safeContentResolver = "1.0.0"
107107
searchPreference = "2.7.3"
108108
spotlessPlugin = "8.0.0"

settings.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,14 +251,14 @@ include(
251251
":feature:debug-settings",
252252
)
253253

254-
check(JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
254+
check(JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21)) {
255255
"""
256-
Java 17+ is required to build Thunderbird for Android.
256+
Java 21+ is required to build Thunderbird for Android.
257257
But it found an incompatible Java version ${{ JavaVersion.current() }}.
258258
259259
Java Home: [${System.getProperty("java.home")}]
260260
261-
Please install Java 17+ and set JAVA_HOME to the directory containing the Java 17+ installation.
261+
Please install Java 21+ and set JAVA_HOME to the directory containing the Java 21+ installation.
262262
https://developer.android.com/build/jdks#jdk-config-in-studio
263263
""".trimIndent()
264264
}

0 commit comments

Comments
 (0)