Merge remote-tracking branch 'origin/develop'

Oztechan · Sep 7, 2023 · 1a61b3a · 1a61b3a
2 parents 8e53f66 + b525509
commit 1a61b3a
Show file tree

Hide file tree

Showing 222 changed files with 2,948 additions and 3,544 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -59,7 +59,7 @@ env:
 jobs:
 
   GradleBuild:
-    runs-on: macos-12
+    runs-on: macos-13
     outputs:
       status: ${{ steps.status.outputs.status }}
     steps:
@@ -90,7 +90,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Assemble
-        uses: gradle/gradle-build-action@v2.6.0
+        uses: gradle/gradle-build-action@v2.8.0
         with:
           arguments: assemble
 
@@ -128,23 +128,23 @@ jobs:
           name: androidArtifacts
 
       - name: Firebase App Distribution Google
-        uses: wzieba/Firebase-Distribution-Github-Action@v1
+        uses: wzieba/Firebase-Distribution-Github-Action@v1.5.1
         with:
           appId: ${{secrets.ANDROID_GOOGLE_FIREBASE_APP_ID}}
           token: ${{secrets.FIREBASE_CLI_TOKEN}}
           groups: QA
           file: google/release/app-google-release.apk
 
       - name: Firebase App Distribution Huawei
-        uses: wzieba/Firebase-Distribution-Github-Action@v1
+        uses: wzieba/Firebase-Distribution-Github-Action@v1.5.1
         with:
           appId: ${{secrets.ANDROID_HUAWEI_FIREBASE_APP_ID}}
           token: ${{secrets.FIREBASE_CLI_TOKEN}}
           groups: QA
           file: huawei/release/app-huawei-release.apk
 
       - name: Delete Android Artifacts
-        uses: geekyeggo/delete-artifact@v2
+        uses: geekyeggo/delete-artifact@v2.0.0
         with:
           name: androidArtifacts
 
@@ -153,7 +153,7 @@ jobs:
         run: echo "::set-output name=status::success"
 
   XCodeBuild:
-    runs-on: macos-12
+    runs-on: macos-13
     outputs:
       status: ${{ steps.status.outputs.status }}
     steps:
@@ -190,7 +190,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Generate Pods
-        uses: gradle/gradle-build-action@v2.6.0
+        uses: gradle/gradle-build-action@v2.8.0
         with:
           arguments: :ios:provider:podGenIOS :client:core:res:podGenIOS --parallel
 
@@ -219,7 +219,7 @@ jobs:
         run: echo "::set-output name=status::success"
 
   DistributeIOS:
-    runs-on: macos-12
+    runs-on: macos-13
     needs: [ XCodeBuild ]
     if: github.event_name == 'push'
     outputs:
@@ -240,7 +240,7 @@ jobs:
           fastlane distribute
 
       - name: Delete iOS IPA
-        uses: geekyeggo/delete-artifact@v2
+        uses: geekyeggo/delete-artifact@v2.0.0
         with:
           name: iOSArtifacts
 
@@ -249,7 +249,7 @@ jobs:
         run: echo "::set-output name=status::success"
 
   Quality:
-    runs-on: macos-12
+    runs-on: macos-13
     outputs:
       status: ${{ steps.status.outputs.status }}
     steps:
@@ -266,7 +266,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Run Quality Jobs
-        uses: gradle/gradle-build-action@v2.6.0
+        uses: gradle/gradle-build-action@v2.8.0
         with:
           arguments: check koverMergedXmlReport --parallel
 
@@ -300,19 +300,19 @@ jobs:
           path: build
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v3.1.4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: build/report.xml
 
       - name: Upload coverage to Codacy
-        uses: codacy/codacy-coverage-reporter-action@v1
+        uses: codacy/codacy-coverage-reporter-action@v1.3.0
         with:
           project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
           coverage-reports: build/report.xml
 
       - name: SonarCloud Scan
-        uses: sonarsource/sonarcloud-github-action@master
+        uses: sonarsource/sonarcloud-github-action@v2.0.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -323,7 +323,7 @@ jobs:
             -Dsonar.coverage.jacoco.xmlReportPaths=build/report.xml
 
       - name: Delete Coverage Report
-        uses: geekyeggo/delete-artifact@v2
+        uses: geekyeggo/delete-artifact@v2.0.0
         with:
           name: coverageReport
 
@@ -349,7 +349,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Detekt
-        uses: gradle/gradle-build-action@v2.6.0
+        uses: gradle/gradle-build-action@v2.8.0
         with:
           arguments: detektAll
 
@@ -378,7 +378,7 @@ jobs:
           false == (needs.UploadQualityReports.outputs.status == 'success') ||
           (false == (needs.DistributeAndroid.outputs.status == 'success') && github.event_name == 'push') ||
           (false == (needs.DistributeIOS.outputs.status == 'success') && github.event_name == 'push')
-        uses: voxmedia/github-action-slack-notify-build@v2
+        uses: voxmedia/github-action-slack-notify-build@v1.6.0
         with:
           channel: ccc-github
           status: FAILED

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
@@ -38,6 +38,17 @@ jobs:
           status_value: "🏗 PR Review"
           move_related_issues: true
 
+      - name: 'Add Dependency PR by renovate to "🏗 PR Review"'
+        if: github.event_name == 'pull_request' && github.event.pull_request.user.login == 'renovate[bot]' && (github.event.action == 'opened' || github.event.action == 'ready_for_review' || github.event.action == 'reopened')
+        uses: leonsteinhaeuser/[email protected]
+        with:
+          gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+          organization: Oztechan
+          project_id: 2
+          resource_node_id: ${{ github.event.pull_request.node_id }}
+          operation_mode: custom_field
+          custom_field_values: '[{\"name\": \"Iteration\",\"type\": \"iteration\",\"value\": \"@current\"}]'
+
       - name: 'Move Related Issue to "🚧 In Progress"'
         if: github.event_name == 'pull_request' && github.event.action == 'converted_to_draft'
         uses: leonsteinhaeuser/[email protected]

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -30,7 +30,7 @@ jobs:
 
       - name: Notify slack fail
         if: false == (needs.PublishRelease.outputs.status == 'success')
-        uses: voxmedia/github-action-slack-notify-build@v2
+        uses: voxmedia/github-action-slack-notify-build@v1.6.0
         env:
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -85,7 +85,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Generate Artifacts
-        uses: gradle/gradle-build-action@v2.6.0
+        uses: gradle/gradle-build-action@v2.8.0
         with:
           arguments: :android:app:bundleRelease :backend:app:jar --parallel
 
@@ -138,7 +138,7 @@ jobs:
           status: completed
 
       - name: Delete App Bundle
-        uses: geekyeggo/delete-artifact@v2
+        uses: geekyeggo/delete-artifact@v2.0.0
         with:
           name: googleBundle
 
@@ -159,17 +159,17 @@ jobs:
           name: huaweiBundle
 
       - name: Deploy to Huawei App Gallery
-        uses: muhamedzeema/appgallery-deply-action@main
+        uses: muhamedzeema/appgallery-deply-action@v1
         with:
           client-id: ${{secrets.HUAWEI_CLIENT_ID}}
           client-key: ${{secrets.HUAWEI_CLIENT_KEY}}
-          app-id: "com.oztechan.ccc.huawei"
+          app-id: "104920917"
           file-extension: "aab"
           file-path: "app-huawei-release.aab"
           file-name: "app-huawei-release"
 
       - name: Delete App Bundle
-        uses: geekyeggo/delete-artifact@v2
+        uses: geekyeggo/delete-artifact@v2.0.0
         with:
           name: huaweiBundle
 
@@ -191,7 +191,7 @@ jobs:
           path: artifact
 
       - name: Deploy to Server
-        uses: easingthemes/ssh-deploy@main
+        uses: easingthemes/ssh-deploy@v4.1.8
         env:
           SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
           REMOTE_HOST: ${{ secrets.REMOTE_HOST }}
@@ -200,7 +200,7 @@ jobs:
           SOURCE: "artifact/"
 
       - name: Delete Backend Jar
-        uses: geekyeggo/delete-artifact@v2
+        uses: geekyeggo/delete-artifact@v2.0.0
         with:
           name: backendJar
 
@@ -209,7 +209,7 @@ jobs:
         run: echo "::set-output name=status::success"
 
   UploadToAppStore:
-    runs-on: macos-12
+    runs-on: macos-13
     outputs:
       status: ${{ steps.status.outputs.status }}
     steps:
@@ -235,7 +235,7 @@ jobs:
           gpg -d --passphrase "${{ secrets.SECRET_PASSWORD }}" --batch Release.xcconfig.asc > ios/CCC/Resources/Release/Config.xcconfig
 
       - name: Generate Pods
-        uses: gradle/gradle-build-action@v2.6.0
+        uses: gradle/gradle-build-action@v2.8.0
         with:
           arguments: :ios:provider:podGenIOS :client:core:res:podGenIOS --parallel
 
@@ -262,7 +262,7 @@ jobs:
           needs.UploadToHuaweiAppGallery.outputs.status == 'success' &&
           needs.DeployToServer.outputs.status == 'success' &&
           needs.UploadToAppStore.outputs.status == 'success'
-        uses: voxmedia/github-action-slack-notify-build@v2
+        uses: voxmedia/github-action-slack-notify-build@v1.6.0
         with:
           channel: ccc-github
           status: SUCCESS
@@ -274,7 +274,7 @@ jobs:
           false == (needs.UploadToHuaweiAppGallery.outputs.status == 'success') ||
           false == (needs.DeployToServer.outputs.status == 'success') ||
           false == (needs.UploadToAppStore.outputs.status == 'success')
-        uses: voxmedia/github-action-slack-notify-build@v2
+        uses: voxmedia/github-action-slack-notify-build@v1.6.0
         with:
           channel: ccc-github
           status: FAILED

diff --git a/CCC.gradle.kts b/CCC.gradle.kts
@@ -5,7 +5,6 @@ import io.gitlab.arturbosch.detekt.Detekt
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    @Suppress("DSL_SCOPE_VIOLATION")
     libs.plugins.apply {
         alias(kover)
         alias(detekt)
@@ -60,7 +59,14 @@ allprojects {
             setSource(files(project.projectDir))
             exclude("**/build/**")
             exclude {
-                it.file.relativeTo(projectDir).startsWith(project.buildDir.relativeTo(projectDir))
+                it.file.relativeTo(projectDir).startsWith(
+                    project.layout.buildDirectory.asFile.get().relativeTo(projectDir)
+                )
+            }
+        }.onEach { detekt ->
+            // skip detekt tasks unless a it is specifically called
+            detekt.onlyIf {
+                gradle.startParameter.taskNames.any { it.contains("detekt") }
             }
         }
 
@@ -72,7 +78,6 @@ allprojects {
             detektPlugins(rootProject.libs.common.detektFormatting)
         }
     }
-
     tasks.withType<KotlinCompile> {
         kotlinOptions {
             allWarningsAsErrors = true

diff --git a/android/app/android-app.gradle.kts b/android/app/android-app.gradle.kts
@@ -8,7 +8,6 @@ import config.key.Key
 import config.key.secret
 
 plugins {
-    @Suppress("DSL_SCOPE_VIOLATION")
     libs.plugins.apply {
         id(androidApp.get().pluginId)
         id(crashlytics.get().pluginId)
@@ -18,7 +17,6 @@ plugins {
     }
 }
 
-@Suppress("UnstableApiUsage")
 android {
     ProjectSettings.apply {
         namespace = Modules.Android.app.packageName

diff --git a/android/app/src/main/kotlin/com/oztechan/ccc/android/app/di/Koin.kt b/android/app/src/main/kotlin/com/oztechan/ccc/android/app/di/Koin.kt
@@ -91,7 +91,7 @@ fun initKoin(context: Context) = startKoin {
         // endregion
     )
 }.also {
-    Logger.i { "Koin initialised" }
+    Logger.v { "Koin initialised" }
 }
 
 private fun getAndroidPlatformModule() = module { singleOf(::provideDevice) }

diff --git a/android/core/ad/android-core-ad.gradle.kts b/android/core/ad/android-core-ad.gradle.kts
@@ -8,7 +8,6 @@ import config.key.secret
 import config.key.string
 
 plugins {
-    @Suppress("DSL_SCOPE_VIOLATION")
     libs.plugins.apply {
         id(androidLib.get().pluginId)
         id(android.get().pluginId)
@@ -28,7 +27,6 @@ android {
     }
 
     DeviceFlavour.apply {
-        @Suppress("UnstableApiUsage")
         flavorDimensions.addAll(listOf(flavorDimension))
 
         productFlavors {