From 14fb8524e621abc3a0bc2a163c17ce0ceededdc9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 23 May 2024 15:59:41 +0000 Subject: [PATCH 1/5] Update dependency com.project.starter:android to v0.74.0 --- sample/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample/build.gradle b/sample/build.gradle index ad27725c..93c00bf4 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -15,7 +15,7 @@ buildscript { } } dependencies { - classpath "com.project.starter:android:0.73.0" + classpath "com.project.starter:android:0.74.0" classpath "io.github.usefulness:screenshot-testing-plugin:1.1.0" if (project.hasProperty("useMavenLocal")) { classpath "com.project.starter.local:easylauncher:+" From a05ebfc1c3493a15987f8b1c6597dd27d540deec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Kwiecin=CC=81ski?= Date: Fri, 24 May 2024 23:58:58 +0200 Subject: [PATCH 2/5] Require AGP 8.2.2 --- .github/workflows/default.yml | 8 ++++---- .gitignore | 1 + sample/build.gradle | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 544ffd3d..b999b03b 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -89,14 +89,14 @@ jobs: agp: ${{ fromJSON(needs.provide-agp-version-matrix.outputs.agp-versions) }} include: - javaVersion: 17 - gradle: "8.0" - agp: 8.0.0 + gradle: "8.2.1" + agp: 8.2.2 - javaVersion: 17 gradle: current - agp: 8.0.0 + agp: 8.2.2 - javaVersion: 19 gradle: current - agp: 8.0.0 + agp: 8.2.2 name: Run Gradle-${{ matrix.gradle }}, AGP-${{ matrix.agp }}, Java-${{ matrix.javaVersion }} steps: diff --git a/.gitignore b/.gitignore index 55230842..23ca1c95 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ local.properties build/ reports/ *.iml +.kotlin diff --git a/sample/build.gradle b/sample/build.gradle index 93c00bf4..11484f10 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -108,7 +108,7 @@ subprojects { } if (lastTask != null) { - if (gradle.gradleVersion.startsWith("8.0")) { + if (gradle.gradleVersion.startsWith("8.2")) { return } tasks.named { it == "record${variant.name.capitalize()}AndroidTestScreenshotTest" }.configureEach { From eb51b92cad6cbee8e6e784ed5731b751c657304d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Kwiecin=CC=81ski?= Date: Fri, 24 May 2024 23:59:04 +0200 Subject: [PATCH 3/5] Readme updates --- README.md | 56 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 06e45781..0eaaeec1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Easylauncher gradle plugin for Android +# Easylauncher Gradle Plugin for Android [![build](https://github.com/usefulness/easylauncher-gradle-plugin/actions/workflows/default.yml/badge.svg)](https://github.com/usefulness/easylauncher-gradle-plugin/actions/workflows/default.yml)  [![ktlint](https://img.shields.io/badge/code%20style-%E2%9D%A4-FF4081.svg)](https://ktlint.github.io/) @@ -50,6 +50,12 @@ plugins { } ``` +Alternatively, if using Version Catalog: +```toml +[plugins] +starter-easylauncher = { id = "com.starter.easylauncher", version.ref = "easylauncher" } +``` + See [related issue](https://github.com/usefulness/easylauncher-gradle-plugin/issues/80) for more information. @@ -65,26 +71,26 @@ Imagine these are the type and flavors of your app: // in app/build.gradle android { buildTypes { - debug { + named("debug") { //Debuggable, will get a default ribbon in the launcher icon } - beta { + named("release") { + //Non-debuggable, will not get any default ribbon + } + register("beta") { //Debuggable, will get a default ribbon in the launcher icon debuggable true } - canary { + register('canary') { //Non-debuggable, will not get any default ribbon debuggable false } - release { - //Non-debuggable, will not get any default ribbon - } } productFlavors { - local {} - qa {} - staging {} - production {} + register("local") {} + register("qa") {} + register("staging") {} + register("production") {} } } ``` @@ -95,36 +101,36 @@ You could customize the plugin's behaviour like this: ```groovy easylauncher { - defaultFlavorNaming true // Use flavor name for default ribbon, instead of the type name - showWarnings true // Defines if the plugins should show warnings at configuration time + defaultFlavorNaming = true // Use flavor name for default ribbon, instead of the type name + showWarnings = true // Defines if the plugins should show warnings at configuration time productFlavors { - local {} - qa { + register("local") {} + register("qa") { // Add one more filter to all `qa` variants filters redRibbonFilter() } - staging {} - production {} + register("staging") {} + register("production") {} } buildTypes { - beta { + register("beta") { // Add two more filters to all `beta` variants filters = [ customRibbon(ribbonColor: "#0000FF"), overlayFilter(file("example-custom/launcherOverlay/beta.png")) ] } - canary { + register("canary") { // Remove ALL filters to `canary` variants - enable false + enable = false } - release {} + register("release") {} } variants { - productionDebug { + register("productionDebug") { // OVERRIDE all previous filters defined for `productionDebug` variant filters = orangeRibbonFilter("custom") } @@ -141,7 +147,7 @@ easylauncher { iconNames = ["@mipmap/custom_launcher_icon"] // optional, disables automatic launcher icon discovery and will use provided icons only buildTypes { - beta { + register("beta") { // icon names can also be provided per each configuration (buildType, productFlavor or variant) iconNames = ["@mipmap/beta_launcher"] } @@ -217,8 +223,8 @@ See [related issue](https://github.com/usefulness/easylauncher-gradle-plugin/iss ## Requirements Minimal requirements for the plugin are: -- Gradle: **8.0** -- Android Gradle Plugin: **8.0.0** +- Gradle: **8.2.1** +- Android Gradle Plugin: **8.2.2** - Java Version: **11** - minSdkVersion: **26** _(theoretically there should be no lower boundary - it just hasn't been tested)_ From 117acf68753a8db0aaa4a3bfe9ff642fbbd2042d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Kwiecin=CC=81ski?= Date: Sat, 25 May 2024 00:01:37 +0200 Subject: [PATCH 4/5] Do not test for custom font --- sample/example-vector/build.gradle | 4 ---- .../Icons_doScreenshot(customFont).png | Bin 27656 -> 0 bytes 2 files changed, 4 deletions(-) delete mode 100644 sample/example-vector/screenshots/Icons_doScreenshot(customFont).png diff --git a/sample/example-vector/build.gradle b/sample/example-vector/build.gradle index e8367969..d8b2e2dd 100644 --- a/sample/example-vector/build.gradle +++ b/sample/example-vector/build.gradle @@ -118,10 +118,6 @@ easylauncher { alpha { filters customRibbon(ribbonColor: "#99000000", labelColor: "#88FF0000", textSizeRatio: 0.3f) } - customFont { - filters customRibbon(label: "regular", font: "ComicSansMS", position: "top"), - chromeLike(label: "bold", font: "ComicSansMS-Bold") - } customFontByFile { filters customRibbon(label: "\ue868\ue3B7", font: file("fonts/MaterialIcons-Regular.ttf"), position: "top"), chromeLike(label: "\ue857\ue8DC", font: file("fonts/MaterialIcons-Regular.ttf")) diff --git a/sample/example-vector/screenshots/Icons_doScreenshot(customFont).png b/sample/example-vector/screenshots/Icons_doScreenshot(customFont).png deleted file mode 100644 index 1cc73c543f4471d17ae2658685535d9633134026..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27656 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 I*1gAn2TkqMH~;_u From 62b9c222732a57334708e6a1eb6c653851168436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Kwieci=C5=84ski?= <36954793+mateuszkwiecinski@users.noreply.github.com> Date: Sat, 18 May 2024 18:25:58 +0200 Subject: [PATCH 5/5] Update default.yml --- .github/workflows/default.yml | 11 +++++++++-- sample/example-vector/build.gradle | 3 --- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index b999b03b..12fa0173 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -200,11 +200,18 @@ jobs: uses: actions/upload-artifact@v4 with: name: failedScreenshots - path: "${{ github.workspace }}/**/build/failedScreenshots" + path: "**/reports/failedScreenshots" + + - name: Upload failed screenshots + if: ${{ failure() }} + uses: actions/upload-artifact@v4 + with: + name: tests + path: "**/reports/androidTests" - name: Upload screenshot tests result uses: actions/upload-artifact@v4 if: ${{ always() }} with: name: screenshots - path: "${{ github.workspace }}/**/build/*AndroidTest/" + path: "**/reports/screenshots**AndroidTest*/" diff --git a/sample/example-vector/build.gradle b/sample/example-vector/build.gradle index d8b2e2dd..24e4d6e4 100644 --- a/sample/example-vector/build.gradle +++ b/sample/example-vector/build.gradle @@ -36,9 +36,6 @@ android { register("alpha") { dimension "reportedBugs" } - register("customFont") { - dimension "reportedBugs" - } register("customFontByFile") { dimension "reportedBugs" }