diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 7733d6f..252985d 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -12,19 +12,24 @@ jobs: - name: Code auschecken uses: actions/checkout@v4 - - name: Java/JDK einrichten - uses: actions/setup-java@v3 + # HIER IST DIE LÖSUNG: Java 25 statt 17 bereitstellen + - name: Java/JDK 25 einrichten + uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '25' distribution: 'temurin' + - name: Gradle einrichten + uses: gradle/actions/setup-gradle@v3 + - name: Android Release APK bauen + # Keine fehleranfälligen Flags mehr nötig! run: | chmod +x gradlew ./gradlew assembleRelease - name: Release in Gitea erstellen - uses: gitea/action-gitea-release@v1 + uses: softprops/action-gh-release@v2 with: files: app/build/outputs/apk/release/*.apk env: diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 096fbdd..e3a9ded 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -27,14 +27,18 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 } buildFeatures { compose = true } } +kotlin { + jvmToolchain(25) +} + dependencies { implementation(platform(libs.androidx.compose.bom)) implementation(libs.androidx.activity.compose) diff --git a/settings.gradle.kts b/settings.gradle.kts index c7b1f77..d9ac6e6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,9 +11,6 @@ pluginManagement { gradlePluginPortal() } } -plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" -} dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories {