Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Java 21 #8928

Merged
merged 4 commits into from
Nov 12, 2024
Merged

Java 21 #8928

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/post-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 3 additions & 3 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions dependencies_groups.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ ext.groups = [
'org.jacoco',
'org.java-websocket',
'org.jcodec',
'org.jcommander',
'org.jetbrains',
'org.jetbrains.dokka',
'org.jetbrains.intellij.deps',
Expand All @@ -229,6 +230,7 @@ ext.groups = [
'org.reactivestreams',
'org.robolectric',
'org.slf4j',
'org.snakeyaml',
'org.sonatype.oss',
'org.testng',
'org.threeten',
Expand Down
2 changes: 0 additions & 2 deletions library/external/textdrawable/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
apply plugin: 'com.android.library'

apply plugin: 'com.android.library'

android {
namespace "com.amulyakhare.textdrawable"

Expand Down
6 changes: 5 additions & 1 deletion tools/detekt/detekt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ style:
active: false
UseCheckOrError:
active: false
UnusedPrivateProperty:
active: false

empty-blocks:
EmptyFunctionBlock:
Expand Down Expand Up @@ -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:
Expand All @@ -91,7 +95,7 @@ comments:
EndOfSentenceFormat:
active: true
OutdatedDocumentation:
active: true
active: false
UndocumentedPublicClass:
active: false
UndocumentedPublicFunction:
Expand Down
Loading