Skip to content

Commit 11c8a62

Browse files
fix: sample (#1)
* fix: sample M android/app/build.gradle.kts * fix: sonar M .github/workflows/security-scan.yaml * fix: sonar M .github/workflows/security-scan.yaml * fix: sonar M .gitignore D android/.gitignore A android/gradlew A android/gradlew.bat * fix: sonar M .github/workflows/security-scan.yaml * fix: sonar M .github/workflows/security-scan.yaml M flake.nix * fix: sonar M .github/workflows/security-scan.yaml M flake.lock M pubspec.lock M pubspec.yaml * fix: sonar M .github/workflows/security-scan.yaml * fix: sonar M .github/workflows/security-scan.yaml * fix: sonar M .github/workflows/security-scan.yaml M android/gradlew * fix: sonar M .github/workflows/security-scan.yaml * fix: sonar M android/gradlew * fix: sonar M android/gradlew * fix: sonar M .github/workflows/security-scan.yaml M android/app/build.gradle.kts A sonar-project.properties * fix: sonar M sonar-project.properties * fix: sonar M sonar-project.properties * fix: sonar M sonar-project.properties * feat: removed sonar in Makefile M Makefile
1 parent 9ce1fd4 commit 11c8a62

File tree

12 files changed

+284
-74
lines changed

12 files changed

+284
-74
lines changed

.github/workflows/security-scan.yaml

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Save repo to artifact
2424
uses: actions/upload-artifact@v4
2525
with:
26-
name: android-client
26+
name: flutter-client
2727
path: .
2828
overwrite: true
2929
if-no-files-found: error
@@ -36,22 +36,14 @@ jobs:
3636
if: ${{ github.actor != 'dependabot[bot]' }}
3737
strategy:
3838
fail-fast: false
39-
matrix:
40-
java_version: [21]
4139

4240
steps:
4341
- name: Download repo artifact
4442
uses: actions/download-artifact@v5
4543
with:
46-
name: android-client
44+
name: flutter-client
4745
path: .
4846

49-
- name: Set up JDK ${{ matrix.java_version }}
50-
uses: actions/setup-java@v5
51-
with:
52-
java-version: ${{ matrix.java_version }}
53-
distribution: "zulu"
54-
5547
- name: GitGuardian scan
5648
uses: GitGuardian/ggshield-action@v1.43.0
5749
env:
@@ -68,20 +60,17 @@ jobs:
6860
key: ${{ runner.os }}-sonar
6961
restore-keys: ${{ runner.os }}-sonar
7062

71-
- name: Cache Gradle packages
72-
uses: actions/cache@v4
63+
- name: Set up Flutter
64+
uses: subosito/flutter-action@v2
7365
with:
74-
path: ~/.gradle/caches
75-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
76-
restore-keys: ${{ runner.os }}-gradle
77-
78-
- name: Make gradlew executable
79-
run: chmod +x ./gradlew
66+
channel: stable
67+
flutter-version: 3.32.8
8068

8169
- name: Build
8270
run: |
83-
./gradlew build sonar --info
71+
chmod +x ./android/gradlew
72+
flutter build appbundle
8473
- name: SonarQube Scan
85-
uses: SonarSource/sonarqube-scan-action@v5
74+
uses: SonarSource/sonarqube-scan-action@v6
8675
env:
8776
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ local.properties
77
app/build
88
kls_database.db
99
build/reports
10+
GeneratedPluginRegistrant.java
11+
.cxx/
12+
key.properties
13+
**/*.keystore
14+
**/*.jks
15+
gradle-wrapper.jar
1016

1117
# Miscellaneous
1218
*.class

Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,3 @@ emulate: # Start emulator
3030
-memory 4096 \
3131
-no-snapshot-load \
3232
-no-snapshot-save &
33-
34-
.PHONY: sonar
35-
sonar:
36-
./gradlew build sonar --info

android/.gitignore

Lines changed: 0 additions & 14 deletions
This file was deleted.

android/app/build.gradle.kts

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,10 @@ plugins {
66
id("dev.flutter.flutter-gradle-plugin")
77
}
88

9-
sonar {
10-
properties {
11-
property(
12-
"sonar.projectKey",
13-
"ZProfile_flutter-client",
14-
)
15-
property(
16-
"sonar.organization",
17-
"zprofile01",
18-
)
19-
property(
20-
"sonar.verbose",
21-
true,
22-
)
23-
property(
24-
"sonar.flutter.source.version",
25-
"3.8.1",
26-
)
27-
property(
28-
"sonar.language",
29-
"flutter",
30-
)
31-
}
32-
}
33-
349
android {
3510
namespace = "com.example.zprofile"
3611
compileSdk = flutter.compileSdkVersion
12+
3713
// ndkVersion = flutter.ndkVersion
3814
ndkVersion = "26.1.10909125"
3915

android/gradlew

Lines changed: 160 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/gradlew.bat

Lines changed: 90 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)