Merge pull request #144 from FossifyOrg/v1.1.1

chore(release): prepare release v1.1.1

.github/dependabot.yml

@@ -0,0 +1,34 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "chore"
+      prefix-development: "chore"
+      include: "scope"
+    assignees:
+      - "naveensingh"
+
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "chore"
+      prefix-development: "chore"
+      include: "scope"
+    assignees:
+      - "naveensingh"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "chore"
+      prefix-development: "chore"
+      include: "scope"
+    assignees:
+      - "naveensingh"

.github/workflows/foss-release.yml

@@ -0,0 +1,25 @@
+name: Github Release
+
+on:
+  push:
+    tags:
+      - "*.*.*"
+
+permissions:
+  contents: read
+
+jobs:
+  call-release-workflow:
+    uses: FossifyOrg/.github/.github/workflows/release.yml@main
+    with:
+      tag: ${{ github.ref_name }}
+      flavor: "foss"
+      package_name: "org.fossify.home"
+
+    secrets:
+      ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
+      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
+      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
+      SERVICE_ACCOUNT_JSON_KEY_BASE64: ""
+      FOSSIFYBOT_TOKEN: ${{ secrets.FOSSIFYBOT_TOKEN }}

.github/workflows/gplay-release.yml

@@ -0,0 +1,46 @@
+name: Google Play Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      track:
+        description: "Google Play Store release track"
+        required: false
+        type: choice
+        default: "beta"
+        options:
+          - internal
+          - alpha
+          - beta
+          - production
+      rollout:
+        description: "Rollout fraction (0.0-1.0)"
+        required: false
+        type: string
+        default: "0.05"
+      validate_only:
+        description: "Fastlane dry-run?"
+        required: false
+        type: boolean
+        default: false
+
+permissions:
+  contents: read
+
+jobs:
+  call-release-workflow:
+    uses: FossifyOrg/.github/.github/workflows/release.yml@main
+    with:
+      flavor: "gplay"
+      package_name: "org.fossify.home"
+      track: ${{ github.event.inputs.track }}
+      rollout: ${{ github.event.inputs.rollout }}
+      validate_only: ${{ github.event.inputs.validate_only == 'true' }}
+
+    secrets:
+      ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
+      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
+      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
+      SERVICE_ACCOUNT_JSON_KEY_BASE64: ${{ secrets.SERVICE_ACCOUNT_JSON_KEY_BASE64 }}
+      FOSSIFYBOT_TOKEN: ""

.github/workflows/image-minimizer.js

@@ -1,148 +0,0 @@
-/*
- * Script for minimizing big images (jpg,gif,png) when they are uploaded to GitHub and not edited otherwise.
- * Source: https://github.com/TeamNewPipe/NewPipe/blob/dev/.github/workflows/image-minimizer.js
- */
-module.exports = async ({github, context}) => {
-    const IGNORE_KEY = '<!-- IGNORE IMAGE MINIFY -->';
-    const IGNORE_ALT_NAME_END = 'ignoreImageMinify';
-    // Targeted maximum height
-    const IMG_MAX_HEIGHT_PX = 400;
-    // maximum width of GitHub issues/comments
-    const IMG_MAX_WIDTH_PX = 800;
-    // all images that have a lower aspect ratio (-> have a smaller width) than this will be minimized
-    const MIN_ASPECT_RATIO = IMG_MAX_WIDTH_PX / IMG_MAX_HEIGHT_PX
-
-    // Get the body of the image
-    let initialBody = null;
-    if (context.eventName == 'issue_comment') {
-        initialBody = context.payload.comment.body;
-    } else if (context.eventName == 'issues') {
-        initialBody = context.payload.issue.body;
-    } else if (context.eventName == 'pull_request_target') {
-        initialBody = context.payload.pull_request.body;
-    } else {
-        console.log('Aborting: No body found');
-        return;
-    }
-    console.log(`Found body: \n${initialBody}\n`);
-
-    // Check if we should ignore the currently processing element
-    if (initialBody.includes(IGNORE_KEY)) {
-        console.log('Ignoring: Body contains IGNORE_KEY');
-        return;
-    }
-
-    // Regex for finding images (simple variant) ![ALT_TEXT](https://*.githubusercontent.com/<number>/<variousHexStringsAnd->.<fileExtension>)
-    const REGEX_USER_CONTENT_IMAGE_LOOKUP = /\!\[(.*)\]\((https:\/\/[-a-z0-9]+\.githubusercontent\.com\/\d+\/[-0-9a-f]{32,512}\.(jpg|gif|png))\)/gm;
-    const REGEX_ASSETS_IMAGE_LOCKUP = /\!\[(.*)\]\((https:\/\/github\.com\/user-attachments\/assets\/[\-0-9a-f]{36,})\)/gm;
-
-    // Check if we found something
-    let foundSimpleImages = REGEX_USER_CONTENT_IMAGE_LOOKUP.test(initialBody)
-        || REGEX_ASSETS_IMAGE_LOCKUP.test(initialBody);
-    if (!foundSimpleImages) {
-        console.log('Found no simple images to process');
-        return;
-    }
-
-    console.log('Found at least one simple image to process');
-
-    // Require the probe lib for getting the image dimensions
-    const probe = require('probe-image-size');
-    
-    var wasMatchModified = false;
-
-    // Try to find and replace the images with minimized ones
-    let newBody = await replaceAsync(initialBody, REGEX_USER_CONTENT_IMAGE_LOOKUP, minimizeAsync);
-    newBody = await replaceAsync(newBody, REGEX_ASSETS_IMAGE_LOCKUP, minimizeAsync);
-    
-    if (!wasMatchModified) {
-        console.log('Nothing was modified. Skipping update');
-        return;
-    }
-
-    // Update the corresponding element
-    if (context.eventName == 'issue_comment') {
-        console.log('Updating comment with id', context.payload.comment.id);
-        await github.rest.issues.updateComment({
-            comment_id: context.payload.comment.id,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            body: newBody
-        })
-    } else if (context.eventName == 'issues') {
-        console.log('Updating issue', context.payload.issue.number);
-        await github.rest.issues.update({
-            issue_number: context.payload.issue.number,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            body: newBody
-        });
-    } else if (context.eventName == 'pull_request_target') {
-        console.log('Updating pull request', context.payload.pull_request.number);
-        await github.rest.pulls.update({
-            pull_number: context.payload.pull_request.number,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            body: newBody
-        });
-    }
-
-    // Async replace function from https://stackoverflow.com/a/48032528
-    async function replaceAsync(str, regex, asyncFn) {
-        const promises = [];
-        str.replace(regex, (match, ...args) => {
-            const promise = asyncFn(match, ...args);
-            promises.push(promise);
-        });
-        const data = await Promise.all(promises);
-        return str.replace(regex, () => data.shift());
-    }
-
-    async function minimizeAsync(match, g1, g2) {
-            console.log(`Found match '${match}'`);
-
-            if (g1.endsWith(IGNORE_ALT_NAME_END)) {
-                console.log(`Ignoring match '${match}': IGNORE_ALT_NAME_END`);
-                return match;
-            }
-
-            let probeAspectRatio = 0;
-            let shouldModify = false;
-            try {
-                console.log(`Probing ${g2}`);
-                let probeResult = await probe(g2);
-                if (probeResult == null) {
-                    throw 'No probeResult';
-                }
-                if (probeResult.hUnits != 'px') {
-                    throw `Unexpected probeResult.hUnits (expected px but got ${probeResult.hUnits})`;
-                }
-                if (probeResult.height <= 0) {
-                    throw `Unexpected probeResult.height (height is invalid: ${probeResult.height})`;
-                }
-                if (probeResult.wUnits != 'px') {
-                    throw `Unexpected probeResult.wUnits (expected px but got ${probeResult.wUnits})`;
-                }
-                if (probeResult.width <= 0) {
-                    throw `Unexpected probeResult.width (width is invalid: ${probeResult.width})`;
-                }
-                console.log(`Probing resulted in ${probeResult.width}x${probeResult.height}px`);
-
-                probeAspectRatio = probeResult.width / probeResult.height;
-                shouldModify = probeResult.height > IMG_MAX_HEIGHT_PX && probeAspectRatio < MIN_ASPECT_RATIO;
-            } catch(e) {
-                console.log('Probing failed:', e);
-                // Immediately abort
-                return match;
-            }
-
-            if (shouldModify) {
-                wasMatchModified = true;
-                console.log(`Modifying match '${match}'`);
-                return `<img alt="${g1}" src="${g2}" width=${Math.min(600, Math.floor(IMG_MAX_HEIGHT_PX * probeAspectRatio))} />`;
-            }
-
-            console.log(`Match '${match}' is ok/will not be modified`);
-            return match;
-        }
-}

.github/workflows/image-minimizer.yml

@@ -9,26 +9,7 @@ on:
     types: [opened, edited]
 
 jobs:
-  try-minimize:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.FOSSIFYBOT_TOKEN }}
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 16
-
-      - name: Install probe-image-size
-        run: npm i probe-image-size@7.2.3 --ignore-scripts
-
-      - name: Minimize simple images
-        uses: actions/github-script@v7
-        timeout-minutes: 3
-        with:
-          github-token: ${{ secrets.FOSSIFYBOT_TOKEN }}
-          script: |
-            const script = require('.github/workflows/image-minimizer.js');
-            await script({github, context});
+  call-image-minimizer-workflow:
+    uses: FossifyOrg/.github/.github/workflows/image-minimizer.yml@main
+    secrets:
+      FOSSIFYBOT_TOKEN: ${{ secrets.FOSSIFYBOT_TOKEN }}

.github/workflows/no-response.yml

@@ -1,24 +1,12 @@
-name: no-response
+name: No Response
 
 on:
   schedule:
-    - cron: '0 0 * * *' # Runs daily at midnight
+    - cron: '0 12 * * *' # Runs daily at noon
   workflow_dispatch:
 
 jobs:
-  noResponse:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v9
-        with:
-          repo-token: ${{ secrets.FOSSIFYBOT_TOKEN }}
-          days-before-stale: -1
-          # Number of days of inactivity before an issue is closed for lack of response.
-          days-before-close: 14
-          only-labels: 'waiting for author'
-          stale-issue-label: 'waiting for author'
-          stale-pr-label: 'waiting for author'
-          remove-stale-when-updated: false
-          ignore-updates: true
-          close-issue-message: This issue has been automatically closed due to inactivity. We requested additional information but have not received a response from the original author. Without the requested details, we cannot proceed. If you have or find the information needed, please comment so we can reopen the issue.
-          close-pr-message: This pull request has been automatically closed due to inactivity. We requested additional information but have not received a response from the original author. Without the requested details, we cannot proceed. If you have the needed information or updates, please reopen the PR or comment so we can continue the review.
+  call-no-response-workflow:
+    uses: FossifyOrg/.github/.github/workflows/no-response.yml@main
+    secrets:
+      FOSSIFYBOT_TOKEN: ${{ secrets.FOSSIFYBOT_TOKEN }}

.github/workflows/pr-labeler.yml

@@ -0,0 +1,15 @@
+name: PR Labeler
+
+on:
+  pull_request_target:
+    types: [opened]
+
+permissions:
+  contents: read
+  # write permission is not required as FOSSIFYBOT_TOKEN is used
+
+jobs:
+  call-pr-labeler-workflow:
+    uses: FossifyOrg/.github/.github/workflows/pr-labeler.yml@main
+    secrets:
+      FOSSIFYBOT_TOKEN: ${{ secrets.FOSSIFYBOT_TOKEN }}

.github/workflows/release-commenter.yml

@@ -0,0 +1,17 @@
+name: Release Commenter
+
+on:
+  release:
+    types: [published]
+
+permissions:
+  contents: read
+  issues: read
+  pull-requests: read
+  # write permission is not required as FOSSIFYBOT_TOKEN is used
+
+jobs:
+  call-release-commenter:
+    uses: FossifyOrg/.github/.github/workflows/release-commenter.yml@main
+    secrets:
+      FOSSIFYBOT_TOKEN: ${{ secrets.FOSSIFYBOT_TOKEN }}

.gitignore

@@ -9,5 +9,4 @@
 keystore.jks
 keystore.properties
 fastlane/fastlane.json
-Gemfile
-Gemfile.lock
+fastlane/report.xml

CHANGELOG.md

@@ -1,22 +1,59 @@
-Changelog
-==========
+# Changelog
 
-Version 1.1.0 *(2025-03-19)*
-----------------------------
+All notable changes to this project will be documented in this file.
 
-* Added double tap to lock screen feature (https://github.com/FossifyOrg/Launcher/issues/63)
-* Added more translations
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-Version 1.0.1 *(2025-01-01)*
-----------------------------
+## [Unreleased]
 
-* Fixed scrolling performance issues (https://github.com/FossifyOrg/Launcher/issues/65)
-* Fixed various issues related to widgets (https://github.com/FossifyOrg/Launcher/issues/5, https://github.com/FossifyOrg/Launcher/issues/44, https://github.com/FossifyOrg/Launcher/issues/74)
-* Other minor bug fixes and improvements
-* Added more translations
+## [1.1.1] - 2025-05-14
 
+### Changed
 
-Version 1.0.0 *(2024-10-16)*
-----------------------------
+- Updated translations
 
-* Initial release
+### Removed
+
+- Removed redundant launcher settings icon from the app drawer ([#51])
+
+## [1.1.0] - 2025-03-19
+
+### Added
+
+- Added double tap to lock screen feature ([#63])
+
+### Changed
+
+- Added more translations
+
+## [1.0.1] - 2025-01-01
+
+### Changed
+
+- Other minor bug fixes and improvements
+- Added more translations
+
+### Fixed
+
+- Fixed scrolling performance issues ([#65])
+- Fixed various issues related to widgets ([#5], [#44], [#74])
+
+## [1.0.0] - 2024-10-16
+
+### Added
+
+- Initial release
+
+[Unreleased]: https://github.com/FossifyOrg/Launcher/compare/1.1.1...HEAD
+[1.1.1]: https://github.com/FossifyOrg/Launcher/compare/1.1.0...1.1.1
+[1.1.0]: https://github.com/FossifyOrg/Launcher/compare/1.0.1...1.1.0
+[1.0.1]: https://github.com/FossifyOrg/Launcher/compare/1.0.0...1.0.1
+[1.0.0]: https://github.com/FossifyOrg/Launcher/releases/tag/1.0.0
+
+[#5]: https://github.com/FossifyOrg/Launcher/issues/5
+[#44]: https://github.com/FossifyOrg/Launcher/issues/44
+[#51]: https://github.com/FossifyOrg/Launcher/issues/51
+[#63]: https://github.com/FossifyOrg/Launcher/issues/63
+[#65]: https://github.com/FossifyOrg/Launcher/issues/65
+[#74]: https://github.com/FossifyOrg/Launcher/issues/74

Gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gem "fastlane"
+gem "fastlane-plugin-fossify", "~> 1.0"

Gemfile.lock

@@ -0,0 +1,231 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.7)
+      base64
+      nkf
+      rexml
+    abbrev (0.1.2)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    artifactory (3.0.17)
+    atomos (0.1.3)
+    aws-eventstream (1.3.2)
+    aws-partitions (1.1097.0)
+    aws-sdk-core (3.223.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      jmespath (~> 1, >= 1.6.1)
+      logger
+    aws-sdk-kms (1.100.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.185.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.11.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.4)
+    base64 (0.2.0)
+    claide (1.1.0)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    declarative (0.0.20)
+    digest-crc (0.7.0)
+      rake (>= 12.0.0, < 14.0.0)
+    domain_name (0.6.20240107)
+    dotenv (2.8.1)
+    emoji_regex (3.2.3)
+    excon (0.112.0)
+    faraday (1.10.4)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
+      http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (1.0.2)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.1)
+      faraday (~> 1.0)
+    fastimage (2.4.0)
+    fastlane (2.227.2)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.8, < 3.0.0)
+      artifactory (~> 3.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.3, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored (~> 1.2)
+      commander (~> 4.6)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 1.0)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 1.0)
+      fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
+      http-cookie (~> 1.0.5)
+      json (< 3.0.0)
+      jwt (>= 2.1.0, < 3)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
+      naturally (~> 2.2)
+      optparse (>= 0.1.1, < 1.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      security (= 0.1.5)
+      simctl (~> 1.6.3)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (~> 3)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.4.1)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-plugin-fossify (1.0.2)
+      abbrev
+    fastlane-sirp (1.0.0)
+      sysrandom (~> 1.0)
+    gh_inspector (1.1.3)
+    google-apis-androidpublisher_v3 (0.54.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.3)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.8.0)
+      google-cloud-env (>= 1.0, < 3.a)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.5.0)
+    google-cloud-storage (1.47.0)
+      addressable (~> 2.8)
+      digest-crc (~> 0.4)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.31.0)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
+      mini_mime (~> 1.0)
+    googleauth (1.8.1)
+      faraday (>= 0.17.3, < 3.a)
+      jwt (>= 1.4, < 3.0)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
+    http-cookie (1.0.8)
+      domain_name (~> 0.5)
+    httpclient (2.9.0)
+      mutex_m
+    jmespath (1.6.2)
+    json (2.11.3)
+    jwt (2.10.1)
+      base64
+    logger (1.7.0)
+    mini_magick (4.13.2)
+    mini_mime (1.1.5)
+    multi_json (1.15.0)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
+    nanaimo (0.4.0)
+    naturally (2.2.1)
+    nkf (0.2.0)
+    optparse (0.6.0)
+    os (1.1.4)
+    plist (3.7.2)
+    public_suffix (6.0.2)
+    rake (13.2.1)
+    representable (3.2.0)
+      declarative (< 0.1.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rexml (3.4.1)
+    rouge (3.28.0)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.4.1)
+    security (0.1.5)
+    signet (0.20.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.10)
+      CFPropertyList
+      naturally
+    sysrandom (1.0.5)
+    terminal-notifier (2.0.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    trailblazer-option (0.1.2)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.2)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    uber (0.1.0)
+    unicode-display_width (2.6.0)
+    word_wrap (1.0.0)
+    xcodeproj (1.27.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
+    xcpretty (0.4.1)
+      rouge (~> 3.28.0)
+    xcpretty-travis-formatter (1.0.1)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  fastlane
+  fastlane-plugin-fossify (~> 1.0)
+
+BUNDLED WITH
+   2.6.8

app/.gitignore

@@ -1,3 +1,3 @@
 /build
 /foss
-/prepaid
+/gplay

app/build.gradle.kts

@@ -15,6 +15,13 @@ if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(FileInputStream(keystorePropertiesFile))
 }
 
+fun hasSigningVars(): Boolean {
+    return providers.environmentVariable("SIGNING_KEY_ALIAS").orNull != null
+            && providers.environmentVariable("SIGNING_KEY_PASSWORD").orNull != null
+            && providers.environmentVariable("SIGNING_STORE_FILE").orNull != null
+            && providers.environmentVariable("SIGNING_STORE_PASSWORD").orNull != null
+}
+
 android {
     compileSdk = project.libs.versions.app.build.compileSDKVersion.get().toInt()
 
@@ -38,6 +45,15 @@ android {
                 storeFile = file(keystoreProperties.getProperty("storeFile"))
                 storePassword = keystoreProperties.getProperty("storePassword")
             }
+        } else if (hasSigningVars()) {
+            register("release") {
+                keyAlias = providers.environmentVariable("SIGNING_KEY_ALIAS").get()
+                keyPassword = providers.environmentVariable("SIGNING_KEY_PASSWORD").get()
+                storeFile = file(providers.environmentVariable("SIGNING_STORE_FILE").get())
+                storePassword = providers.environmentVariable("SIGNING_STORE_PASSWORD").get()
+            }
+        } else {
+            logger.warn("Warning: No signing config found. Build will be unsigned.")
         }
     }
 
@@ -57,7 +73,7 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            if (keystorePropertiesFile.exists()) {
+            if (keystorePropertiesFile.exists() || hasSigningVars()) {
                 signingConfig = signingConfigs.getByName("release")
             }
         }
@@ -67,7 +83,7 @@ android {
     productFlavors {
         register("core")
         register("foss")
-        register("prepaid")
+        register("gplay")
     }
 
     sourceSets {
@@ -99,7 +115,6 @@ android {
 
     bundle {
         language {
-            @Suppress("UnstableApiUsage")
             enableSplit = false
         }
     }

app/src/main/kotlin/org/fossify/home/activities/MainActivity.kt

@@ -1020,20 +1020,6 @@ class MainActivity : SimpleActivity(), FlingListener {
             )
         }
 
-        // add Launcher settings as an app
-        val drawable = getDrawableForPackageName(packageName)
-        val placeholderColor = calculateAverageColor(drawable!!.toBitmap())
-        val launcherSettings =
-            AppLauncher(
-                id = null,
-                title = getString(R.string.launcher_settings),
-                packageName = packageName,
-                activityName = "",
-                order = 0,
-                thumbnailColor = placeholderColor,
-                drawable = drawable.toBitmap().toDrawable(resources)
-            )
-        allApps.add(launcherSettings)
         launchersDB.insertAll(allApps)
         return allApps
     }

app/src/main/kotlin/org/fossify/home/extensions/Activity.kt

@@ -38,12 +38,6 @@ import org.fossify.home.interfaces.ItemMenuListener
 import org.fossify.home.models.HomeScreenGridItem
 
 fun Activity.launchApp(packageName: String, activityName: String) {
-    // if this is true, launch the app settings
-    if (packageName == this.packageName) {
-        startActivity(Intent(applicationContext, SettingsActivity::class.java))
-        return
-    }
-
     try {
         Intent(Intent.ACTION_MAIN).apply {
             addCategory(Intent.CATEGORY_LAUNCHER)

app/src/main/res/menu/menu_settings.xml

@@ -10,6 +10,6 @@
         app:showAsAction="always" />
     <item
         android:id="@+id/more_apps_from_us"
-        android:title="@string/more_apps_from_us"
+        android:title="@string/more_fossify_apps"
         app:showAsAction="never" />
 </menu>

app/src/main/res/values-el/strings.xml

@@ -3,7 +3,7 @@
     <string name="app_launcher_name">Εκκινητής</string>
     <string name="launcher_settings">Ρυθμίσεις Εκκινητή</string>
     <string name="app_info">Πληροφορίες εφαρμογής</string>
-    <string name="touch_hold_widget">Παρατεταμένο άγγιγμα στο Γραφικό και σύρετέ το στην αρχική σας οθόνη.</string>
+    <string name="touch_hold_widget">Πατήστε παρατεταμένα το γραφικό στοιχείο και σύρετέ το στην αρχική οθόνη</string>
     <string name="uninstall">Απεγκατάσταση</string>
     <string name="hide_icon">Απόκρυψη εικονιδίου</string>
     <string name="add_hidden_icons">Προσθήκη κρυφών εικονιδίων</string>
@@ -14,4 +14,7 @@
     <string name="close_app_drawer_on_app_open">Κλείστε το συρτάρι εφαρμογών κατά το άνοιγμα μιας εφαρμογής</string>
     <string name="home_screen_settings">Αρχική οθόνη</string>
     <string name="widget_too_big">Το γραφικό είναι πολύ μεγάλο για το τρέχον μέγεθος της αρχικής οθόνης</string>
+    <string name="lock_device_admin_hint">Για να ενεργοποιήσετε τη λειτουργία διπλής βρύσης για κλείδωμα οθόνης, πρέπει να παραχωρήσετε άδεια διαχειριστή. Λάβετε υπόψη ότι δεν είναι δυνατή η κατάργηση εγκατάστασης της εφαρμογής μέχρι να καταργηθεί αυτή η άδεια.</string>
+    <string name="double_tap_to_lock">Διπλό πάτημα για κλείδωμα οθόνης</string>
+    <string name="lock_device_admin_warning">Η απενεργοποίηση της άδειας διαχειριστή θα απενεργοποιήσει τη λειτουργία διπλής βρύσης για κλείδωμα οθόνης.</string>
 </resources>

app/src/main/res/values-es/strings.xml

@@ -15,4 +15,6 @@
     <string name="widget_too_big">El widget es demasiado grande para el tamaño actual de la pantalla de inicio</string>
     <string name="home_screen_settings">Pantalla de inicio</string>
     <string name="double_tap_to_lock">Toca dos veces para bloquear la pantalla</string>
+    <string name="lock_device_admin_warning">Al desactivar el permiso de administrador se desactivará la función de doble toque para bloquear la pantalla.</string>
+    <string name="lock_device_admin_hint">Para activar la función de doble toque para bloquear la pantalla, debes conceder un permiso de administrador. Tenga en cuenta que la aplicación no se puede desinstalar hasta que se elimine este permiso.</string>
 </resources>

app/src/main/res/values-fi/strings.xml

@@ -11,4 +11,10 @@
     <string name="hidden_icons">Piilotetut kuvakkeet</string>
     <string name="hidden_icons_placeholder">Joitakin sovelluksia ei ole järjestelmärajoitusten vuoksi mahdollista poistaa, mutta voit kuitenkin piilottaa niiden kuvakkeet näkyvistä.</string>
     <string name="widget_too_big">Vimpain on liian suuri nykyiseen aloitusnäytön kokoon</string>
+    <string name="home_screen_settings">Kotinäyttö</string>
+    <string name="close_app_drawer_on_app_open">Sulje sovellusvedin, kun uusi sovellus avataan</string>
+    <string name="app_drawer_settings">Sovellusvedin</string>
+    <string name="lock_device_admin_hint">Näytön kaksoisnapautuslukitus vaatii pääkäyttäjäoikeuksia. Huomio, että sovellusta ei voida poistaa, ennen kuin tämä oikeus on poistettu.</string>
+    <string name="double_tap_to_lock">Kaksoisnapauta lukitaksesi näytön</string>
+    <string name="lock_device_admin_warning">Pääkäyttäjäoikeuden poiskytkentä, estää kaksoisnapautuslukituksen toiminnan.</string>
 </resources>

app/src/main/res/values-hi/strings.xml

@@ -14,4 +14,7 @@
     <string name="close_app_drawer_on_app_open">ऐप खोलने पर ऐप ड्रॉअर बंद कर दें</string>
     <string name="home_screen_settings">होम स्क्रीन</string>
     <string name="widget_too_big">वर्तमान होम स्क्रीन आकार के लिए विजेट बहुत बड़ा है</string>
+    <string name="lock_device_admin_hint">स्क्रीन लॉक करने के लिए डबल-टैप करने वाले फीचर को सक्षम करने के लिए प्रशासनिक अनुमति आवश्यक है। ध्यान रखें कि ये ऐप अनइंस्टॉल नहीं हो पाएगा जब तक ये अनुमति रहेगी।</string>
+    <string name="double_tap_to_lock">स्क्रीन लॉक करने के लिए डबल टैप करें</string>
+    <string name="lock_device_admin_warning">प्रशासनिक अनुमतियाँ हटाये जाने पर डबल-टैप स्क्रीन लॉक सुविधा अक्षम हो जायेगी।</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -14,4 +14,7 @@
     <string name="home_screen_settings">Tela inicial</string>
     <string name="widget_too_big">O widget é muito grande para o tamanho atual da tela inicial</string>
     <string name="app_launcher_name">Launcher</string>
-</resources>
+    <string name="double_tap_to_lock">Toque duas vezes para bloquear a tela</string>
+    <string name="lock_device_admin_hint">Para habilitar o recurso de toque duplo para bloquear a tela, você precisa conceder permissão de administrador. Observe que o aplicativo não pode ser desinstalado até que essa permissão seja removida.</string>
+    <string name="lock_device_admin_warning">Desativar a permissão de administrador desabilitará o recurso de toque duplo para bloquear a tela.</string>
+</resources>

fastlane/Fastfile

@@ -1,38 +1,12 @@
-# This file contains the fastlane.tools configuration
-# You can find the documentation at https://docs.fastlane.tools
-#
-# For a list of all available actions, check out
-#
-#     https://docs.fastlane.tools/actions
-#
-# For a list of all available plugins, check out
-#
-#     https://docs.fastlane.tools/plugins/available-plugins
-#
-
-# Uncomment the line if you want fastlane to automatically update itself
-# update_fastlane
-
 default_platform(:android)
 
 platform :android do
-  desc "Runs all the tests"
-  lane :test do
-    gradle(task: "test")
-  end
+  desc 'Run unit & instrumentation tests'
+  lane(:test) { test_android }
 
-  desc "Submit a new Beta Build to Crashlytics Beta"
-  lane :beta do
-    gradle(task: "clean assembleRelease")
-    crashlytics
-  
-    # sh "your_script.sh"
-    # You can also use other beta testing services here
-  end
+  desc 'Build & deploy AAB to Google Play (includes metadata)'
+  lane(:deploy) { deploy_android }
 
-  desc "Deploy a new version to the Google Play"
-  lane :deploy do
-    gradle(task: "clean assembleRelease")
-    upload_to_play_store
-  end
+  desc 'Push Play Store metadata'
+  lane(:metadata) { metadata_android }
 end

fastlane/README.md

@@ -0,0 +1,48 @@
+fastlane documentation
+----
+
+# Installation
+
+Make sure you have the latest version of the Xcode command line tools installed:
+
+```sh
+xcode-select --install
+```
+
+For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)
+
+# Available Actions
+
+## Android
+
+### android test
+
+```sh
+[bundle exec] fastlane android test
+```
+
+Run unit & instrumentation tests
+
+### android deploy
+
+```sh
+[bundle exec] fastlane android deploy
+```
+
+Build & deploy AAB to Google Play (includes metadata)
+
+### android metadata
+
+```sh
+[bundle exec] fastlane android metadata
+```
+
+Push Play Store metadata
+
+----
+
+This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
+
+More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).
+
+The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).

fastlane/metadata/android/bn-BD/changelogs/1.txt

@@ -1 +0,0 @@
-* প্রাথমিক প্রকাশ

fastlane/metadata/android/ca/changelogs/1.txt

@@ -1 +0,0 @@
-* Llançament inicial

fastlane/metadata/android/ca/changelogs/2.txt

@@ -1,4 +0,0 @@
-* S'han corregit problemes de rendiment de desplaçament
-* S'han corregit diversos problemes relacionats amb els ginys
-* Altres correccions d'errors i millores menors
-* S'han afegit més traduccions

fastlane/metadata/android/ca/title.txt

@@ -1 +0,0 @@
-Fossify Launcher

fastlane/metadata/android/cs-CZ/changelogs/1.txt

@@ -1 +0,0 @@
-* Prvotní vydání

fastlane/metadata/android/cs-CZ/changelogs/2.txt

@@ -1,4 +0,0 @@
-* Opraveny problémy s výkonem při posunu
-* Opraveny různé problémy týkající se widgetů
-* Další menší opravy chyb a vylepšení
-* Přidány další překlady

fastlane/metadata/android/cs-CZ/title.txt

@@ -1 +0,0 @@
-Launcher Fossify

fastlane/metadata/android/de-DE/changelogs/1.txt

@@ -1 +0,0 @@
-* Erste Veröffentlichung

fastlane/metadata/android/de-DE/changelogs/2.txt

@@ -1,4 +0,0 @@
-* Probleme mit der Scroll-Performance behoben
-* Verschiedene Probleme im Zusammenhang mit Widgets behoben
-* Weitere kleinere Fehlerbehebungen und Verbesserungen
-* Weitere Übersetzungen hinzugefügt

fastlane/metadata/android/de-DE/title.txt

@@ -1 +0,0 @@
-Fossify Launcher

fastlane/metadata/android/en-US/changelogs/4.txt

@@ -0,0 +1,7 @@
+Changed:
+
+• Updated translations
+
+Removed:
+
+• Removed redundant launcher settings icon from the app drawer

fastlane/metadata/android/eo/title.txt

@@ -1 +0,0 @@
-Fossify Lanĉilo

fastlane/metadata/android/es-ES/changelogs/1.txt

@@ -1 +0,0 @@
-* Versión inicial

fastlane/metadata/android/es-ES/title.txt

@@ -1 +0,0 @@
-Fossify Launcher

fastlane/metadata/android/et/changelogs/1.txt

@@ -1 +0,0 @@
-* Esmane versioon

fastlane/metadata/android/et/changelogs/2.txt

@@ -1,4 +0,0 @@
-* Parandasime jõudlusvead kerimisel
-* Parandasime erinevad vidinate vead
-* Muud väiksemad veaparandused ja täiendused
-* Lisasime veel tõlkeid

fastlane/metadata/android/et/title.txt

@@ -1 +0,0 @@
-Fossify käivitaja

fastlane/metadata/android/fr-FR/changelogs/1.txt

@@ -1 +0,0 @@
-* Version initiale

fastlane/metadata/android/fr-FR/changelogs/2.txt

@@ -1,4 +0,0 @@
-* Correction des problèmes de performances de défilement
-* Correction de divers problèmes liés aux widgets
-* Autres corrections de bugs et améliorations mineures
-* Ajout de traductions supplémentaires

fastlane/metadata/android/fr-FR/short_description.txt

@@ -1 +1 @@
-Personnalisez votre écran d'accueil avec un lanceur rapide, sans pubs, et open-source
+Paramétrez votre écran d'accueil avec un lanceur rapide, sans pub, open-source

fastlane/metadata/android/fr-FR/title.txt

@@ -1 +0,0 @@
-Fossify Lanceur

fastlane/metadata/android/ga/changelogs/1.txt

@@ -1 +0,0 @@
-* Eisiúint tosaigh

fastlane/metadata/android/ga/changelogs/2.txt

@@ -1,4 +0,0 @@
-* Saincheisteanna feidhmíochta scrollaithe seasta
-* Socraithe saincheisteanna éagsúla a bhaineann le giuirléidí
-* Ceartúcháin agus feabhsuithe beaga eile ar fhabht
-* Cuireadh tuilleadh aistriúcháin leis

fastlane/metadata/android/ga/title.txt

@@ -1 +0,0 @@
-Fossify Launcher

fastlane/metadata/android/gl-ES/changelogs/1.txt

@@ -1 +0,0 @@
-* Versión inicial

fastlane/metadata/android/gl-ES/title.txt

@@ -1 +0,0 @@
-Fossify Launcher

fastlane/metadata/android/id/changelogs/1.txt

@@ -1 +0,0 @@
-* Rilis awal

fastlane/metadata/android/it-IT/changelogs/1.txt

@@ -1 +0,0 @@
-* Versione iniziale

fastlane/metadata/android/it-IT/changelogs/2.txt

@@ -1,4 +0,0 @@
-* Risolti i problemi di performance dello scrolling
-* Risolti vari problemi relativi ai widget
-* Altre correzioni e miglioramenti minori
-* Aggiunta di altre traduzioni

fastlane/metadata/android/it-IT/title.txt

@@ -1 +0,0 @@
-Launcher Fossify

fastlane/metadata/android/nl-NL/title.txt

@@ -1 +0,0 @@
-Fossify Launcher

fastlane/metadata/android/pl-PL/title.txt

@@ -1 +0,0 @@
-Fossify Launcher

fastlane/metadata/android/ru-RU/short_description.txt

@@ -0,0 +1 @@
+Настройте свой домашний экран с быстрым лаунчером без рекламы с открытым исходным кодом

fastlane/metadata/android/sv-SE/changelogs/1.txt

@@ -1 +0,0 @@
-* Initial version

fastlane/metadata/android/sv-SE/title.txt

@@ -1 +0,0 @@
-Fossify Launcher

fastlane/metadata/android/tr-TR/changelogs/1.txt

@@ -1 +0,0 @@
-* İlk sürüm

fastlane/metadata/android/tr-TR/changelogs/2.txt

@@ -1,4 +0,0 @@
-* Kaydırma performansı hataları düzeltildi
-* Widget'larla ilgili çeşitli sorunları düzeltti
-* Diğer küçük hata düzeltmeleri ve iyileştirmeleri
-* Daha fazla çeviri eklendi

fastlane/metadata/android/tr-TR/title.txt

@@ -1 +0,0 @@
-Fossify Başlatıcı

fastlane/metadata/android/uk/changelogs/1.txt

@@ -1 +0,0 @@
-* Початковий випуск

fastlane/metadata/android/uk/changelogs/2.txt

@@ -1,4 +0,0 @@
-* Виправлено проблеми зі швидкістю прокрутки
-* Виправлено різні проблеми, пов'язані з віджетами
-* Інші незначні виправлення та покращення
-* Додано більше перекладів

fastlane/metadata/android/uk/title.txt

@@ -1 +0,0 @@
-Fossify Лаунчер

fastlane/metadata/android/zh-CN/changelogs/1.txt

@@ -1 +0,0 @@
-* 首次发布

fastlane/metadata/android/zh-CN/title.txt

@@ -1 +0,0 @@
-Fossify 启动器

fastlane/metadata/android/zh-TW/title.txt

@@ -1 +0,0 @@
-Fossify 啟動器

gradle/libs.versions.toml

@@ -8,9 +8,9 @@ detekt = "1.23.3"
 #Room
 room = "2.6.1"
 #Fossify
-commons = "8038e3277e"
+commons = "2.0.0"
 #Gradle
-gradlePlugins-agp = "8.7.3"
+gradlePlugins-agp = "8.10.0"
 #build
 app-build-compileSDKVersion = "34"
 app-build-targetSDK = "34"
@@ -19,8 +19,8 @@ app-build-javaVersion = "VERSION_17"
 app-build-kotlinJVMTarget = "17"
 #versioning
 app-version-appId = "org.fossify.home"
-app-version-versionCode = "3"
-app-version-versionName = "1.1.0"
+app-version-versionCode = "4"
+app-version-versionName = "1.1.1"
 [libraries]
 #Room
 androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Mon Aug 01 22:01:46 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,69 +15,104 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +122,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal