From 87fcbcf33a7995d40c7b89e1f15d29cc1d58f743 Mon Sep 17 00:00:00 2001 From: "denys.kramar" Date: Thu, 17 Apr 2025 09:57:03 +0300 Subject: [PATCH 01/12] add build file --- .github/workflows/build.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..2fc3086 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,34 @@ +name: Android Build + +on: + push: + branches: [ "master", "dev" ] + pull_request: + branches: [ "main", "dev" ] + +jobs: + build: + name: Build Debug APK + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 17 + + - name: Make gradlew executable + run: chmod +x ./gradlew + + - name: Build APK (debug) + run: ./gradlew assembleDebug + + - name: Upload Debug APK + uses: actions/upload-artifact@v3 + with: + name: debug-apk + path: app/build/outputs/apk/debug/app-debug.apk \ No newline at end of file From ac7a04adc4b244a80e1b70b7ea2e7d316df2e377 Mon Sep 17 00:00:00 2001 From: "denys.kramar" Date: Thu, 17 Apr 2025 09:58:29 +0300 Subject: [PATCH 02/12] add build file --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2fc3086..f833d0e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,8 @@ jobs: uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/upload-artifact@v4 + with: distribution: 'temurin' java-version: 17 From 5d232e4c88e9f96c5dbabdb82da218a8d49d5ec1 Mon Sep 17 00:00:00 2001 From: "denys.kramar" Date: Thu, 17 Apr 2025 09:59:17 +0300 Subject: [PATCH 03/12] add build file --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f833d0e..b4ba498 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,8 +16,7 @@ jobs: uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/upload-artifact@v4 - + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: 17 @@ -29,7 +28,8 @@ jobs: run: ./gradlew assembleDebug - name: Upload Debug APK - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 + with: name: debug-apk path: app/build/outputs/apk/debug/app-debug.apk \ No newline at end of file From b1d3dcdbb64dc21114c0574acbe8665849b541b1 Mon Sep 17 00:00:00 2001 From: "denys.kramar" Date: Thu, 17 Apr 2025 10:06:18 +0300 Subject: [PATCH 04/12] change autoRunner to create release build --- .github/workflows/build.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b4ba498..6799a13 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Android Build +name: Android Release Build on: push: @@ -8,7 +8,7 @@ on: jobs: build: - name: Build Debug APK + name: Build Release APK runs-on: ubuntu-latest steps: @@ -24,12 +24,11 @@ jobs: - name: Make gradlew executable run: chmod +x ./gradlew - - name: Build APK (debug) - run: ./gradlew assembleDebug + - name: Build APK (release) + run: ./gradlew assembleRelease - - name: Upload Debug APK + - name: Upload Release APK uses: actions/upload-artifact@v4 - with: - name: debug-apk - path: app/build/outputs/apk/debug/app-debug.apk \ No newline at end of file + name: release-apk + path: app/build/outputs/apk/release/app-release.apk From ebb295befa8ded71fb354ea02175024a554496d4 Mon Sep 17 00:00:00 2001 From: "denys.kramar" Date: Thu, 17 Apr 2025 11:44:09 +0300 Subject: [PATCH 05/12] change autoRunner to create release build --- .github/workflows/build.yml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6799a13..8875dd3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,10 +1,7 @@ name: Android Release Build on: - push: - branches: [ "master", "dev" ] - pull_request: - branches: [ "main", "dev" ] + workflow_dispatch: jobs: build: @@ -32,3 +29,20 @@ jobs: with: name: release-apk path: app/build/outputs/apk/release/app-release.apk + + trigger_gitlab: + name: Trigger GitLab Pipeline + runs-on: ubuntu-latest + needs: build + + steps: + - name: Trigger GitLab Pipeline + run: | + curl -X POST \ + -H "Authorization: token glptt-a2d76965ee2147ad4673d042403400769f29ab1c" \ + -d '{"ref": "WebHookTest"}' \ + "https://gitlab.com/api/v4/projects/1324/trigger/pipeline" + env: + GITLAB_TOKEN: ${{ glptt-a2d76965ee2147ad4673d042403400769f29ab1c }} + GITLAB_PROJECT_ID: ${{ 1324 }} + From 090df13cac8852943dd06f428dba8a1d6a07dcd2 Mon Sep 17 00:00:00 2001 From: "denys.kramar" Date: Thu, 17 Apr 2025 11:46:31 +0300 Subject: [PATCH 06/12] change autoRunner to create release build --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8875dd3..458be47 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,6 +35,7 @@ jobs: runs-on: ubuntu-latest needs: build + steps: - name: Trigger GitLab Pipeline run: | From 7574b92acd1d80e79b43b4d6c8d092bf90e23b00 Mon Sep 17 00:00:00 2001 From: "denys.kramar" Date: Thu, 17 Apr 2025 11:56:54 +0300 Subject: [PATCH 07/12] test1 --- .github/workflows/build.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 458be47..58078ba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,8 +35,20 @@ jobs: runs-on: ubuntu-latest needs: build - steps: + - name: Checkout repository (for GitLab sync) + uses: actions/checkout@v3 + + - name: Set up Git for GitLab sync + run: | + git config --global user.name "Denys Kramar" + git config --global user.email "denys.kramar@onix-systems.com" + + - name: Push changes to GitLab + run: | + git remote set-url origin https://oauth2:${{ glptt-a2d76965ee2147ad4673d042403400769f29ab1c }}@gitlab.com/onix-systems/android-sonar.git + git push origin HEAD:WebHookTest + - name: Trigger GitLab Pipeline run: | curl -X POST \ From e76cf94517ce9b28ad04cc767f01cf010773b5b7 Mon Sep 17 00:00:00 2001 From: "denys.kramar" Date: Thu, 17 Apr 2025 12:05:42 +0300 Subject: [PATCH 08/12] test1 --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 458be47..aeb7d9e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,6 +18,7 @@ jobs: distribution: 'temurin' java-version: 17 + - name: Make gradlew executable run: chmod +x ./gradlew From b8f88f53bf66b7a6aad316b0e9a7a62208fa5d9b Mon Sep 17 00:00:00 2001 From: "denys.kramar" Date: Thu, 17 Apr 2025 12:32:24 +0300 Subject: [PATCH 09/12] test1 --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2fd9f50..58078ba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,6 @@ jobs: distribution: 'temurin' java-version: 17 - - name: Make gradlew executable run: chmod +x ./gradlew From 2922a633e8299e5505328ef576bb504530881eae Mon Sep 17 00:00:00 2001 From: "denys.kramar" Date: Thu, 17 Apr 2025 13:06:28 +0300 Subject: [PATCH 10/12] test1 --- .github/workflows/build.yml | 67 +++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 58078ba..7ca8a6b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,32 +30,57 @@ jobs: name: release-apk path: app/build/outputs/apk/release/app-release.apk - trigger_gitlab: - name: Trigger GitLab Pipeline + sonarcloud: + name: SonarCloud Scan runs-on: ubuntu-latest needs: build steps: - - name: Checkout repository (for GitLab sync) + - name: Checkout code uses: actions/checkout@v3 - - name: Set up Git for GitLab sync - run: | - git config --global user.name "Denys Kramar" - git config --global user.email "denys.kramar@onix-systems.com" - - - name: Push changes to GitLab - run: | - git remote set-url origin https://oauth2:${{ glptt-a2d76965ee2147ad4673d042403400769f29ab1c }}@gitlab.com/onix-systems/android-sonar.git - git push origin HEAD:WebHookTest - - - name: Trigger GitLab Pipeline - run: | - curl -X POST \ - -H "Authorization: token glptt-a2d76965ee2147ad4673d042403400769f29ab1c" \ - -d '{"ref": "WebHookTest"}' \ - "https://gitlab.com/api/v4/projects/1324/trigger/pipeline" + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 17 + + - name: Cache SonarCloud packages + uses: actions/cache@v3 + with: + path: ~/.sonar/cache + key: ${{ runner.os }}-sonar + restore-keys: ${{ runner.os }}-sonar + + - name: Run SonarCloud Scan + uses: SonarSource/sonarcloud-github-action@v2 + with: + projectBaseDir: . env: - GITLAB_TOKEN: ${{ glptt-a2d76965ee2147ad4673d042403400769f29ab1c }} - GITLAB_PROJECT_ID: ${{ 1324 }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} +# trigger_gitlab: +# name: Trigger GitLab Pipeline +# runs-on: ubuntu-latest +# needs: sonarcloud +# +# steps: +# - name: Checkout repository (for GitLab sync) +# uses: actions/checkout@v3 +# +# - name: Set up Git for GitLab sync +# run: | +# git config --global user.name "Denys Kramar" +# git config --global user.email "denys.kramar@onix-systems.com" +# +# - name: Push changes to GitLab +# run: | +# git remote set-url origin https://oauth2:${{ secrets.GITLAB_TOKEN }}@gitlab.com/onix-systems/android-sonar.git +# git push origin HEAD:WebHookTest +# +# - name: Trigger GitLab Pipeline +# run: | +# curl -X POST \ +# -H "Authorization: token ${{ secrets.GITLAB_TOKEN }}" \ +# -d '{"ref": "WebHookTest"}' \ +# "https://gitlab.com/api/v4/projects/${{ secrets.GITLAB_PROJECT_ID }}/trigger/pipeline" From a1b529494f8281123068adcac2cb91f98353a742 Mon Sep 17 00:00:00 2001 From: "denys.kramar" Date: Thu, 17 Apr 2025 13:08:00 +0300 Subject: [PATCH 11/12] test1 --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7ca8a6b..ce9c96a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,6 +3,7 @@ name: Android Release Build on: workflow_dispatch: + jobs: build: name: Build Release APK From db26e9958ff9367a6d390a865a159eac0afd0c9d Mon Sep 17 00:00:00 2001 From: "denys.kramar" Date: Thu, 17 Apr 2025 13:22:53 +0300 Subject: [PATCH 12/12] test1 --- app/src/main/java/com/greenrou/testinstaller/MainActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/greenrou/testinstaller/MainActivity.kt b/app/src/main/java/com/greenrou/testinstaller/MainActivity.kt index 86d84c3..a3f0a36 100644 --- a/app/src/main/java/com/greenrou/testinstaller/MainActivity.kt +++ b/app/src/main/java/com/greenrou/testinstaller/MainActivity.kt @@ -246,7 +246,7 @@ class MainActivity : ComponentActivity() { val packageInstaller: PackageInstaller = context.packageManager.packageInstaller val params = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { params.setRequireUserAction(PackageInstaller.SessionParams.USER_ACTION_NOT_REQUIRED) }