From 5b547b6ba004e59cc7d8afa58dc0ba63dc87caa8 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 29 Apr 2024 16:49:43 +0200 Subject: [PATCH] Updated build tools --- .idea/kotlinc.xml | 2 +- CHANGELOG.md | 1 + app/build.gradle | 4 ++-- app/src/main/assets/CHANGELOG.md | 1 + build.gradle | 10 +++++----- metadata/en-US/changelogs/2178.txt | 1 + 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 8d81632f83..fe63bb677d 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index d9ceda3ea5..5e6082fe07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ For support you can use [the contact form](https://contact.faircode.eu/?product= * Added expression condition functions, see [the FAQ](https://m66b.github.io/FairEmail/#faq71) * Small improvements and minor bug fixes +* Updated build tools * Updated libraries (including [Bouncy Castle](https://www.bouncycastle.org/)) ### 1.2178 - 2024-04-29 diff --git a/app/build.gradle b/app/build.gradle index aaff561dde..a550c0a91c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -471,11 +471,11 @@ tasks.register('upload') { doLast { println "\nhttps://bitbucket.org/M66B/fairemail-test/downloads/FairEmail-v1." + getVersionCode() + getRevision() + "-" + target + "-release.apk\n" exec { - workingDir "${buildDir}" + workingDir "${getLayout().getBuildDirectory()}" commandLine 'curl', '-o', '/dev/null', '-X', 'POST', "https://M66B:" + localProperties.getProperty("bb.pwd", "") + "@api.bitbucket.org/2.0/repositories/M66B/fairemail-test/downloads", - '--form', "files=@${buildDir}/outputs/apk/" + target.split('-')[0] + "/release/FairEmail-v1." + getVersionCode() + getRevision() + "-" + target.split('-')[0] + "-release.apk;" + + '--form', "files=@${getLayout().getBuildDirectory()}/outputs/apk/" + target.split('-')[0] + "/release/FairEmail-v1." + getVersionCode() + getRevision() + "-" + target.split('-')[0] + "-release.apk;" + "filename=FairEmail-v1." + getVersionCode() + getRevision() + "-" + target + "-release.apk" } } diff --git a/app/src/main/assets/CHANGELOG.md b/app/src/main/assets/CHANGELOG.md index d9ceda3ea5..5e6082fe07 100644 --- a/app/src/main/assets/CHANGELOG.md +++ b/app/src/main/assets/CHANGELOG.md @@ -10,6 +10,7 @@ For support you can use [the contact form](https://contact.faircode.eu/?product= * Added expression condition functions, see [the FAQ](https://m66b.github.io/FairEmail/#faq71) * Small improvements and minor bug fixes +* Updated build tools * Updated libraries (including [Bouncy Castle](https://www.bouncycastle.org/)) ### 1.2178 - 2024-04-29 diff --git a/build.gradle b/build.gradle index 404f5d6b05..28728f81e4 100644 --- a/build.gradle +++ b/build.gradle @@ -12,10 +12,10 @@ buildscript { // https://mvnrepository.com/artifact/com.bugsnag/bugsnag-android-gradle-plugin classpath "com.bugsnag:bugsnag-android-gradle-plugin:8.1.0" // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-gradle-plugin - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" - classpath "org.jetbrains.kotlin:kotlin-android-extensions:1.9.22" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" + classpath "org.jetbrains.kotlin:kotlin-android-extensions:1.9.23" // https://plugins.gradle.org/plugin/de.undercouch.download - classpath "de.undercouch:gradle-download-task:5.5.0" + classpath "de.undercouch:gradle-download-task:5.6.0" } } @@ -27,6 +27,6 @@ allprojects { } } -task clean(type: Delete) { - delete rootProject.buildDir +tasks.register('clean', Delete) { + delete rootProject.getLayout().getBuildDirectory() } diff --git a/metadata/en-US/changelogs/2178.txt b/metadata/en-US/changelogs/2178.txt index 743e8cf58b..e9d42282f8 100644 --- a/metadata/en-US/changelogs/2178.txt +++ b/metadata/en-US/changelogs/2178.txt @@ -10,6 +10,7 @@ Next version * Added expression condition functions, see the FAQ * Small improvements and minor bug fixes +* Updated build tools * Updated libraries (including Bouncy Castle 1.2178 - 2024-04-29