File tree Expand file tree Collapse file tree 10 files changed +20
-20
lines changed
Expand file tree Collapse file tree 10 files changed +20
-20
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ ARG DEBIAN_FRONTEND=noninteractive
44ENV ANDROID_HOME=/usr/lib/android-sdk
55
66RUN apt-get update -y
7- RUN apt-get install -y unzip wget openjdk-17 -jdk vim
7+ RUN apt-get install -y unzip wget openjdk-21 -jdk vim
88
99RUN wget https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip -O /tmp/commandlinetools.zip
1010RUN cd /tmp && unzip commandlinetools.zip
Original file line number Diff line number Diff line change @@ -56,11 +56,11 @@ jobs:
5656 persist-credentials : false
5757 repository : ${{ steps.get-vars.outputs.repo }}
5858 ref : ${{ steps.get-vars.outputs.branch }}
59- - name : Set up JDK 17
59+ - name : Set up JDK 21
6060 uses : actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
6161 with :
6262 distribution : " temurin"
63- java-version : 17
63+ java-version : 21
6464 - name : Install dependencies
6565 run : |
6666 sudo apt install python3-defusedxml
Original file line number Diff line number Diff line change 2323 flavor : [ Generic, Gplay, Huawei ]
2424 steps :
2525 - uses : actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
26- - name : set up JDK 17
26+ - name : set up JDK 21
2727 uses : actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
2828 with :
2929 distribution : " temurin"
Original file line number Diff line number Diff line change @@ -23,10 +23,10 @@ jobs:
2323 task : [ detekt, spotlessKotlinCheck, lint ]
2424 steps :
2525 - uses : actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
26- - name : Set up JDK 17
26+ - name : Set up JDK 21
2727 uses : actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
2828 with :
2929 distribution : " temurin"
30- java-version : 17
30+ java-version : 21
3131 - name : Check ${{ matrix.task }}
3232 run : ./gradlew ${{ matrix.task }}
Original file line number Diff line number Diff line change @@ -46,11 +46,11 @@ jobs:
4646 uses : github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
4747 with :
4848 languages : ${{ matrix.language }}
49- - name : Set up JDK 17
49+ - name : Set up JDK 21
5050 uses : actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
5151 with :
5252 distribution : " temurin"
53- java-version : 17
53+ java-version : 21
5454 - name : Assemble
5555 run : |
5656 mkdir -p "$HOME/.gradle"
Original file line number Diff line number Diff line change @@ -21,10 +21,10 @@ jobs:
2121
2222 steps :
2323 - uses : actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
24- - name : Set up JDK 17
24+ - name : Set up JDK 21
2525 uses : actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
2626 with :
2727 distribution : " temurin"
28- java-version : 17
28+ java-version : 21
2929 - name : Detect SNAPSHOT
3030 run : scripts/analysis/detectWrongSettings.sh
Original file line number Diff line number Diff line change @@ -29,12 +29,12 @@ jobs:
2929 with :
3030 persist-credentials : false
3131
32- - name : set up JDK 17
32+ - name : set up JDK 21
3333 uses : actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
3434 if : ${{ steps.check-secrets.outputs.ok == 'true' }}
3535 with :
3636 distribution : " temurin"
37- java-version : 17
37+ java-version : 21
3838
3939 - name : Build QA
4040 if : ${{ steps.check-secrets.outputs.ok == 'true' }}
Original file line number Diff line number Diff line change @@ -24,11 +24,11 @@ jobs:
2424 steps :
2525 - uses : actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2626
27- - name : Set up JDK 17
27+ - name : Set up JDK 21
2828 uses : actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
2929 with :
3030 distribution : " temurin"
31- java-version : 17
31+ java-version : 21
3232
3333 - name : Delete old comments
3434 env :
Original file line number Diff line number Diff line change @@ -198,8 +198,8 @@ android {
198198 }
199199
200200 compileOptions {
201- sourceCompatibility = JavaVersion .VERSION_17
202- targetCompatibility = JavaVersion .VERSION_17
201+ sourceCompatibility = JavaVersion .VERSION_21
202+ targetCompatibility = JavaVersion .VERSION_21
203203 }
204204
205205 lint {
@@ -240,7 +240,7 @@ kapt.useBuildCache = true
240240
241241ksp.arg(" room.schemaLocation" , " $projectDir /schemas" )
242242
243- kotlin.compilerOptions.jvmTarget.set(JvmTarget .JVM_17 )
243+ kotlin.compilerOptions.jvmTarget.set(JvmTarget .JVM_21 )
244244
245245spotless.kotlin {
246246 target(" **/*.kt" )
Original file line number Diff line number Diff line change @@ -27,16 +27,16 @@ android {
2727 }
2828
2929 compileOptions {
30- sourceCompatibility = JavaVersion .VERSION_17
31- targetCompatibility = JavaVersion .VERSION_17
30+ sourceCompatibility = JavaVersion .VERSION_21
31+ targetCompatibility = JavaVersion .VERSION_21
3232 }
3333
3434 lint.targetSdk = 36
3535 testOptions.targetSdk = 36
3636}
3737
3838kotlin.compilerOptions {
39- jvmTarget.set(JvmTarget .JVM_17 )
39+ jvmTarget.set(JvmTarget .JVM_21 )
4040 freeCompilerArgs.add(" -opt-in=kotlin.RequiresOptIn" )
4141}
4242
You can’t perform that action at this time.
0 commit comments