diff --git a/.gitea/workflows/on_merge_on_release.yml b/.gitea/workflows/on_merge_on_release.yml index 800fc03..cbd71d6 100644 --- a/.gitea/workflows/on_merge_on_release.yml +++ b/.gitea/workflows/on_merge_on_release.yml @@ -16,6 +16,7 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 + ref: master - name: Config git run: | git config --global user.email aminecmi+giteadrone@pm.me @@ -50,7 +51,7 @@ jobs: followtags: true ssh_key: ${{ secrets.PRIVATE_KEY }} tags: true - branch: release + branch: master - name: copy file via ssh password uses: appleboy/scp-action@v0.1.7 with: @@ -124,4 +125,4 @@ jobs: priority: high convert_markdown: true body: Nouveau fichier de mapping pour la version ${{ steps.version.outputs.VERSION }} - attachments: androidApp/build/outputs/mapping/githubConfigRelease/mapping.txt \ No newline at end of file + attachments: androidApp/build/outputs/mapping/githubConfigRelease/mapping.txt diff --git a/build.gradle.kts b/build.gradle.kts index 52e706b..b010676 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { - //trick: for the same plugin versions in all sub-modules - id("com.android.application").version("8.7.3").apply(false) - id("com.android.library").version("8.7.3").apply(false) + // trick: for the same plugin versions in all sub-modules + id("com.android.application").version("8.8.0").apply(false) + id("com.android.library").version("8.8.0").apply(false) id("org.jetbrains.kotlin.android").version("2.1.0").apply(false) kotlin("multiplatform").version("2.1.0").apply(false) id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false) @@ -16,7 +16,6 @@ allprojects { } } - tasks.register("clean", Delete::class) { delete(layout.buildDirectory) } @@ -24,4 +23,4 @@ tasks.register("clean", Delete::class) { dependencies { kover(project(":shared")) kover(project(":androidApp")) -} \ No newline at end of file +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0fc70d3..24448a6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Nov 25 22:48:24 CET 2024 +#Sun Feb 09 14:44:52 CET 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists