mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-27 03:48:12 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8928 from element-hq/feature/bma/java21

Browse source 
Java 21
This commit is contained in:
Benoit Marty 2024-11-12 11:05:09 +01:00 committed by GitHub
commit ac94bff81e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/build.yml vendored
View file

@ -28,11 +28,11 @@ jobs:
with:
# https://github.com/actions/checkout/issues/881
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
- name: Use JDK 17
- name: Use JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '17'
java-version: '21'
- name: Configure gradle
uses: gradle/actions/setup-gradle@v3
with:
@ -57,11 +57,11 @@ jobs:
with:
# https://github.com/actions/checkout/issues/881
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
- name: Use JDK 17
- name: Use JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '17'
java-version: '21'
- name: Configure gradle
uses: gradle/actions/setup-gradle@v3
with:

4
.github/workflows/nightly.yml vendored
View file

@ -20,11 +20,11 @@ jobs:
uses: actions/setup-python@v4
with:
python-version: 3.8
- name: Use JDK 17
- name: Use JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '17'
java-version: '21'
- name: Configure gradle
uses: gradle/actions/setup-gradle@v3
with:

4
.github/workflows/post-pr.yml vendored
View file

@ -44,11 +44,11 @@ jobs:
uses: actions/setup-python@v4
with:
python-version: 3.8
- name: Use JDK 17
- name: Use JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '17'
java-version: '21'
- name: Configure gradle
uses: gradle/actions/setup-gradle@v3
with:

12
.github/workflows/quality.yml vendored
View file

@ -25,11 +25,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Use JDK 17
- name: Use JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '17'
java-version: '21'
- name: Configure gradle
uses: gradle/actions/setup-gradle@v3
with:
@ -48,11 +48,11 @@ jobs:
cancel-in-progress: true
steps:
- uses: actions/checkout@v4
- name: Use JDK 17
- name: Use JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '17'
java-version: '21'
- name: Configure gradle
uses: gradle/actions/setup-gradle@v3
with:
@ -102,11 +102,11 @@ jobs:
cancel-in-progress: true
steps:
- uses: actions/checkout@v4
- name: Use JDK 17
- name: Use JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '17'
java-version: '21'
- name: Configure gradle
uses: gradle/actions/setup-gradle@v3
with:

8
.github/workflows/tests.yml vendored
View file

@ -29,11 +29,11 @@ jobs:
with:
lfs: true
fetch-depth: 0
- name: Use JDK 17
- name: Use JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '17'
java-version: '21'
- name: Configure gradle
uses: gradle/actions/setup-gradle@v3
with:
@ -139,11 +139,11 @@ jobs:
# cancel-in-progress: true
# steps:
# - uses: actions/checkout@v4
# - name: Use JDK 17
# - name: Use JDK 21
# uses: actions/setup-java@v4
# with:
# distribution: 'temurin' # See 'Supported distributions' for available options
# java-version: '17'
# java-version: '21'
# - name: Configure gradle
# uses: gradle/actions/setup-gradle@v3
# with:

2
build.gradle
View file

@ -43,7 +43,7 @@ plugins {
// ktlint Plugin
id "org.jlleitschuh.gradle.ktlint" version "11.3.2"
// Detekt
id "io.gitlab.arturbosch.detekt" version "1.22.0"
id "io.gitlab.arturbosch.detekt" version "1.23.7"
// Ksp
id "com.google.devtools.ksp" version "1.9.24-1.0.20"

6
dependencies.gradle
View file

@ -2,9 +2,9 @@ ext.versions = [
'minSdk' : 21,
'compileSdk' : 34,
'targetSdk' : 34,
'sourceCompat' : JavaVersion.VERSION_17,
'targetCompat' : JavaVersion.VERSION_17,
'jvmTarget' : "17",
'sourceCompat' : JavaVersion.VERSION_21,
'targetCompat' : JavaVersion.VERSION_21,
'jvmTarget' : "21",
]
def gradle = "8.4.2"

2
dependencies_groups.gradle
View file

@ -203,6 +203,7 @@ ext.groups = [
'org.jacoco',
'org.java-websocket',
'org.jcodec',
'org.jcommander',
'org.jetbrains',
'org.jetbrains.dokka',
'org.jetbrains.intellij.deps',
@ -229,6 +230,7 @@ ext.groups = [
'org.reactivestreams',
'org.robolectric',
'org.slf4j',
'org.snakeyaml',
'org.sonatype.oss',
'org.testng',
'org.threeten',

2
library/external/textdrawable/build.gradle vendored
View file

@ -1,7 +1,5 @@
apply plugin: 'com.android.library'
apply plugin: 'com.android.library'
android {
namespace "com.amulyakhare.textdrawable"

6
tools/detekt/detekt.yml
View file

@ -25,6 +25,8 @@ style:
active: false
UseCheckOrError:
active: false
UnusedPrivateProperty:
active: false
empty-blocks:
EmptyFunctionBlock:
@ -75,6 +77,8 @@ naming:
performance:
SpreadOperator:
active: false
ForEachOnRange:
active: false
# Note: all rules for `comments` are disabled by default, but I put them here to be aware of their existence
comments:
@ -91,7 +95,7 @@ comments:
EndOfSentenceFormat:
active: true
OutdatedDocumentation:
active: true
active: false
UndocumentedPublicClass:
active: false
UndocumentedPublicFunction: