yilsem/aiturk-mobil
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

chore(#376): upgrade build JDK from 17 to 21 (#377)

Browse Source 
Co-authored-by: M57 <hy4ri@users.noreply.github.com>
This commit is contained in:
M57andM57 authored and GitHub committed 2026-06-25 22:36:27 +03:00
1 parent ecd223df64
commit a596fa4383
4 files changed
+22 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/android.yml
+12 -12
View File
@@ -29,11 +29,11 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v7 uses: actions/checkout@v7
- name: Set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v5 uses: actions/setup-java@v5
with: with:
distribution: temurin distribution: temurin
java-version: '17' java-version: '21'
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@v6 uses: gradle/actions/setup-gradle@v6
@@ -88,11 +88,11 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v7 uses: actions/checkout@v7
- name: Set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v5 uses: actions/setup-java@v5
with: with:
distribution: temurin distribution: temurin
java-version: '17' java-version: '21'
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@v6 uses: gradle/actions/setup-gradle@v6
@@ -125,11 +125,11 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v7 uses: actions/checkout@v7
- name: Set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v5 uses: actions/setup-java@v5
with: with:
distribution: temurin distribution: temurin
java-version: '17' java-version: '21'
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@v6 uses: gradle/actions/setup-gradle@v6
@@ -163,11 +163,11 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v7 uses: actions/checkout@v7
- name: Set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v5 uses: actions/setup-java@v5
with: with:
distribution: temurin distribution: temurin
java-version: '17' java-version: '21'
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@v6 uses: gradle/actions/setup-gradle@v6
@@ -205,11 +205,11 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v7 uses: actions/checkout@v7
- name: Set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v5 uses: actions/setup-java@v5
with: with:
distribution: temurin distribution: temurin
java-version: '17' java-version: '21'
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@v6 uses: gradle/actions/setup-gradle@v6
@@ -236,11 +236,11 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v7 uses: actions/checkout@v7
- name: Set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v5 uses: actions/setup-java@v5
with: with:
distribution: temurin distribution: temurin
java-version: '17' java-version: '21'
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@v6 uses: gradle/actions/setup-gradle@v6
.github/workflows/release.yml
+4 -4
View File
@@ -27,11 +27,11 @@ jobs:
steps: steps:
- uses: actions/checkout@v7 - uses: actions/checkout@v7
- name: Set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v5 uses: actions/setup-java@v5
with: with:
distribution: temurin distribution: temurin
java-version: "17" java-version: '21'
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@v6 uses: gradle/actions/setup-gradle@v6
@@ -78,11 +78,11 @@ jobs:
steps: steps:
- uses: actions/checkout@v7 - uses: actions/checkout@v7
- name: Set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v5 uses: actions/setup-java@v5
with: with:
distribution: temurin distribution: temurin
java-version: "17" java-version: '21'
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@v6 uses: gradle/actions/setup-gradle@v6
app/build.gradle.kts
+3 -3
View File
@@ -75,8 +75,8 @@ android {
} }
} }
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_21
} }
buildFeatures { buildFeatures {
compose = true compose = true
@@ -99,7 +99,7 @@ android {
} }
kotlin { kotlin {
jvmToolchain(17) jvmToolchain(21)
} }
room { room {
flake.nix
+3 -3
View File
@@ -56,8 +56,8 @@
in { in {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
# Java 17 (required for AGP 8.x / Gradle 8.x) # Java 21 (required for AGP 9.x / Gradle 9.x)
jdk17 jdk21
# Android SDK (platforms, build-tools, platform-tools) # Android SDK (platforms, build-tools, platform-tools)
androidSdk androidSdk
@@ -75,7 +75,7 @@
# Point everything at the Nix-managed SDK # Point everything at the Nix-managed SDK
ANDROID_HOME = "${androidSdk}/libexec/android-sdk"; ANDROID_HOME = "${androidSdk}/libexec/android-sdk";
ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk"; ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
JAVA_HOME = "${pkgs.jdk17}"; JAVA_HOME = "${pkgs.jdk21}";
# Gradle needs a writable home # Gradle needs a writable home
GRADLE_USER_HOME = "$PWD/.gradle-home"; GRADLE_USER_HOME = "$PWD/.gradle-home";