From dc3a1d1fa2193c545321b6ddcdfbc50aed4c5a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20L=C3=B3pez=20Ma=C3=B1as?= Date: Sat, 9 Dec 2023 07:10:30 +0100 Subject: [PATCH] chore: update release workflow and modernize build (#218) --- .github/workflows/release.yml | 5 +++++ build.gradle | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0ccd5e0..f8f2a75 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,6 +27,11 @@ jobs: with: token: ${{ secrets.SYNCED_GITHUB_TOKEN_REPO }} - uses: gradle/wrapper-validation-action@v1.0.4 + - name: Set up JDK 17 + uses: actions/setup-java@v2.3.1 + with: + java-version: '17' + distribution: 'adopt' - name: Create .gpg key run: | echo $GPG_KEY_ARMOR | base64 --decode > ./release.asc diff --git a/build.gradle b/build.gradle index 2939a29..c3f7999 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ buildscript { maven { url "https://plugins.gradle.org/m2/" } } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.1.4' classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.9.10' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10" classpath "com.google.dagger:hilt-android-gradle-plugin:2.48" @@ -77,17 +77,17 @@ subprojects { project -> toolVersion = "0.8.7" } - tasks.withType(Test) { + tasks.withType(Test).configureEach { jacoco.includeNoLocationClasses = true jacoco.excludes = ['jdk.internal.*'] } - task sourcesJar(type: Jar) { + tasks.register('sourcesJar', Jar) { from android.sourceSets.main.java.source archiveClassifier = "sources" } - task javadocJar(type: Jar) { + tasks.register('javadocJar', Jar) { dependsOn(tasks.named("dokkaHtml")) dependsOn(tasks.named("dokkaJavadoc")) archiveClassifier.set("javadoc") @@ -166,6 +166,6 @@ subprojects { project -> } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } \ No newline at end of file