Merge branch 'chore' into initial

This commit is contained in:
robin committed 2026-09-19 16:11:44 +00:00
commit 10b0183945
3 files changed
+15 -9

No files matched your search

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