diff --git a/.github/workflows/android-branch_ci.yml b/.github/workflows/android-branch_ci.yml index fd8b971..b15182f 100644 --- a/.github/workflows/android-branch_ci.yml +++ b/.github/workflows/android-branch_ci.yml @@ -38,8 +38,11 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Get weather.properties from secrets + run: printf "%s" "${{ secrets.WEATHER_PROPERTIES }}" > $GITHUB_WORKSPACE/weather.properties + - name: Build with Gradle - run: ./gradlew clean && ./gradlew assembleAppWithInternetDebug && ./gradlew assembleAppWithoutInternetDebug + run: ./gradlew clean && ./gradlew assembleAppWithInternet && ./gradlew assembleAppWithoutInternet - name: Upload Artifact - WithInternet uses: actions/upload-artifact@v4 diff --git a/.github/workflows/android-main_ci.yml b/.github/workflows/android-main_ci.yml index 8428919..844d8b8 100644 --- a/.github/workflows/android-main_ci.yml +++ b/.github/workflows/android-main_ci.yml @@ -36,8 +36,11 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Get weather.properties from secrets + run: printf "%s" "${{ secrets.WEATHER_PROPERTIES }}" > $GITHUB_WORKSPACE/weather.properties + - name: Build with Gradle - run: ./gradlew clean && ./gradlew assembleAppWithInternetDebug && ./gradlew assembleAppWithoutInternetDebug + run: ./gradlew clean && ./gradlew assembleAppWithInternet && ./gradlew assembleAppWithoutInternet - name: Upload Artifact - WithInternet uses: actions/upload-artifact@v4 diff --git a/.github/workflows/android-pr_ci.yml b/.github/workflows/android-pr_ci.yml index b721916..da5f530 100644 --- a/.github/workflows/android-pr_ci.yml +++ b/.github/workflows/android-pr_ci.yml @@ -36,8 +36,11 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Get weather.properties from secrets + run: printf "%s" "${{ secrets.WEATHER_PROPERTIES }}" > $GITHUB_WORKSPACE/weather.properties + - name: Build with Gradle - run: ./gradlew clean && ./gradlew assembleAppWithInternetDebug && ./gradlew assembleAppWithoutInternetDebug + run: ./gradlew clean && ./gradlew assembleAppWithInternet && ./gradlew assembleAppWithoutInternet - name: Upload Artifact - WithInternet uses: actions/upload-artifact@v4 diff --git a/.github/workflows/android-release_ci-forced.yml b/.github/workflows/android-release_ci-forced.yml index 9a77979..1aebd39 100644 --- a/.github/workflows/android-release_ci-forced.yml +++ b/.github/workflows/android-release_ci-forced.yml @@ -33,8 +33,11 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Get weather.properties from secrets + run: printf "%s" "${{ secrets.WEATHER_PROPERTIES }}" > $GITHUB_WORKSPACE/weather.properties + - name: Build with Gradle - run: ./gradlew clean && ./gradlew assembleAppWithInternetRelease && ./gradlew assembleAppWithoutInternetRelease + run: ./gradlew clean && ./gradlew assembleAppWithInternet && ./gradlew assembleAppWithoutInternet - name: Sign APK - WithInternet uses: ilharp/sign-android-release@v1 diff --git a/.github/workflows/android-release_ci.yml b/.github/workflows/android-release_ci.yml index b097c4e..16cdbf5 100644 --- a/.github/workflows/android-release_ci.yml +++ b/.github/workflows/android-release_ci.yml @@ -35,8 +35,11 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Get weather.properties from secrets + run: printf "%s" "${{ secrets.WEATHER_PROPERTIES }}" > $GITHUB_WORKSPACE/weather.properties + - name: Build with Gradle - run: ./gradlew clean && ./gradlew assembleAppWithInternetRelease && ./gradlew assembleAppWithoutInternetRelease + run: ./gradlew clean && ./gradlew assembleAppWithInternet && ./gradlew assembleAppWithoutInternet - name: Sign APK - WithInternet uses: ilharp/sign-android-release@v1 diff --git a/.gitignore b/.gitignore index 87c35fc..3414aea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ .gradle -/local.properties +/*.properties /.idea/* /.kotlin/* /.vscode/* diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ed3acb..de49008 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ All notable changes to this project will be documented in this file. See [conven - Updated the app icon. - ([1e1b81c](https://github.com/DroidWorksStudio/EasyLauncher/commit/1e1b81cf83341e28c43efb788a86e5d99d061ef4)) - Added custom gestures. - ([924e052](https://github.com/DroidWorksStudio/EasyLauncher/commit/924e052598c9f4c8cd990a2d9e0cdb73c4e1dcfa)) +### Bug Fixes: + +- Fixed .gitignore - ([7c3090f](https://github.com/DroidWorksStudio/EasyLauncher/commit/7c3090fb3b2921ddb094e92d5ccf199554021b0c)) + ### Dependency Updates: - Updated Dependencies - ([8e796ca](https://github.com/DroidWorksStudio/EasyLauncher/commit/8e796ca2fe95aa039873c5b47db7ed50dafdbacc)) @@ -24,6 +28,8 @@ All notable changes to this project will be documented in this file. See [conven ### Refactoring: +- Fixing of workflows - ([204acd4](https://github.com/DroidWorksStudio/EasyLauncher/commit/204acd4b71646e72d5cb1be1350812198e9ec244)) +- More widget stuff and fixing of files. - ([327f144](https://github.com/DroidWorksStudio/EasyLauncher/commit/327f1447a77a4fe9f18aeaa6a98700e85e3d25bc)) - Moved the getActionType function into AppHelper class. - ([48b2913](https://github.com/DroidWorksStudio/EasyLauncher/commit/48b2913797a46857df9ec89348bb1b9e01164c81)) - Added widget page to the gestures. - ([94fe747](https://github.com/DroidWorksStudio/EasyLauncher/commit/94fe747ffdfc869237c1dd200966cda8e2b2fe23)) diff --git a/weather.properties b/weather.properties deleted file mode 100644 index 1bf7ea1..0000000 --- a/weather.properties +++ /dev/null @@ -1 +0,0 @@ -WEATHER_API_KEY=ba0442331f7232028a3efc3f90c1fa84 \ No newline at end of file