Merge remote-tracking branch 'origin/develop'

Author: mustafaozhan

.github/workflows/build.yml

@@ -55,13 +55,13 @@ env:
 jobs:
 
   Build:
-    runs-on: macos-14
+    runs-on: macos-15
     outputs:
       status: ${{ steps.status.outputs.status }}
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@f3f5fec1f5562978457d820f6d6c83b81cac28a9
+        uses: Oztechan/Global/actions/setup-gradle-repo@9ebcfe7cd8670187e6dc14c539718b03d0c07d5b
 
       - name: Adding secret files
         uses: ./.github/actions/add-secret-files

.github/workflows/main.yml

@@ -64,13 +64,13 @@ env:
 jobs:
 
   GradleBuild:
-    runs-on: macos-14
+    runs-on: macos-15
     outputs:
       status: ${{ steps.status.outputs.status }}
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@f3f5fec1f5562978457d820f6d6c83b81cac28a9
+        uses: Oztechan/Global/actions/setup-gradle-repo@9ebcfe7cd8670187e6dc14c539718b03d0c07d5b
 
       - name: Adding secret files
         uses: ./.github/actions/add-secret-files
@@ -89,7 +89,7 @@ jobs:
         run: ./gradlew assemble${{ env.BUILD_TYPE }}
 
       - name: Upload Android ${{ env.BUILD_TYPE }} Artifacts
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.6.1
         if: github.event_name == 'push' || github.event_name == 'schedule'
         with:
           name: androidArtifacts
@@ -117,7 +117,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Download Android ${{ env.BUILD_TYPE }} Artifacts
-        uses: actions/[email protected].8
+        uses: actions/[email protected].9
         with:
           name: androidArtifacts
 
@@ -147,13 +147,13 @@ jobs:
         run: echo "status=success" >> $GITHUB_OUTPUT
 
   XCodeBuild:
-    runs-on: macos-14
+    runs-on: macos-15
     outputs:
       status: ${{ steps.status.outputs.status }}
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@f3f5fec1f5562978457d820f6d6c83b81cac28a9
+        uses: Oztechan/Global/actions/setup-gradle-repo@9ebcfe7cd8670187e6dc14c539718b03d0c07d5b
 
       - name: Adding secret files
         uses: ./.github/actions/add-secret-files
@@ -173,7 +173,7 @@ jobs:
         run: fastlane build${{ env.BUILD_TYPE }}
 
       - name: Upload iOS Debug Artifacts
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.6.1
         if: github.event_name == 'push'
         with:
           name: iOSArtifacts
@@ -182,7 +182,7 @@ jobs:
             ios/CCC_I.app.dSYM.zip
 
       - name: Upload iOS Artifacts
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.6.1
         if: github.event_name == 'schedule'
         with:
           name: iOSArtifacts
@@ -209,7 +209,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Download iOS ${{ env.BUILD_TYPE }} Artifacts
-        uses: actions/[email protected].8
+        uses: actions/[email protected].9
         with:
           name: iOSArtifacts
           path: ios
@@ -231,13 +231,13 @@ jobs:
         run: echo "status=success" >> $GITHUB_OUTPUT
 
   Test:
-    runs-on: macos-14
+    runs-on: macos-15
     outputs:
       status: ${{ steps.status.outputs.status }}
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@f3f5fec1f5562978457d820f6d6c83b81cac28a9
+        uses: Oztechan/Global/actions/setup-gradle-repo@9ebcfe7cd8670187e6dc14c539718b03d0c07d5b
 
       - name: Test
         run: ./gradlew test
@@ -257,13 +257,13 @@ jobs:
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@f3f5fec1f5562978457d820f6d6c83b81cac28a9
+        uses: Oztechan/Global/actions/setup-gradle-repo@9ebcfe7cd8670187e6dc14c539718b03d0c07d5b
 
       - name: Generate Coverage
         run: ./gradlew koverXmlReport
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5.0.6
+        uses: codecov/codecov-action@v5.4.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: build/reports/kover/report.xml
@@ -275,7 +275,7 @@ jobs:
           coverage-reports: build/reports/kover/report.xml
 
       - name: SonarCloud Scan
-        uses: sonarsource/sonarcloud-github-action@v3.1.0
+        uses: sonarsource/sonarcloud-github-action@v5.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -300,7 +300,7 @@ jobs:
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@f3f5fec1f5562978457d820f6d6c83b81cac28a9
+        uses: Oztechan/Global/actions/setup-gradle-repo@9ebcfe7cd8670187e6dc14c539718b03d0c07d5b
 
       - name: Detekt & Lint
         run: ./gradlew detektAll lint

.github/workflows/project.yml

@@ -14,7 +14,7 @@ on:
 
 jobs:
   ProjectAutomations:
-    uses: Oztechan/Global/.github/workflows/reusable-project.yml@f3f5fec1f5562978457d820f6d6c83b81cac28a9
+    uses: Oztechan/Global/.github/workflows/reusable-project.yml@9ebcfe7cd8670187e6dc14c539718b03d0c07d5b
     with:
       project_id: 2
     secrets: inherit

.github/workflows/publish.yml

@@ -8,7 +8,7 @@ on:
 jobs:
 
   PublishRelease:
-    uses: Oztechan/Global/.github/workflows/reusable-publish.yml@f3f5fec1f5562978457d820f6d6c83b81cac28a9
+    uses: Oztechan/Global/.github/workflows/reusable-publish.yml@9ebcfe7cd8670187e6dc14c539718b03d0c07d5b
     with:
       slack_channel: "ccc-github"
     secrets: inherit

.github/workflows/release.yml

@@ -61,7 +61,7 @@ jobs:
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@f3f5fec1f5562978457d820f6d6c83b81cac28a9
+        uses: Oztechan/Global/actions/setup-gradle-repo@9ebcfe7cd8670187e6dc14c539718b03d0c07d5b
 
       - name: Adding secret files
         uses: ./.github/actions/add-secret-files
@@ -80,19 +80,19 @@ jobs:
         run: ./gradlew :android:app:bundleRelease :backend:app:jar --parallel
 
       - name: Upload Google App Bundle
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.6.1
         with:
           name: googleBundle
           path: android/app/build/outputs/bundle/googleRelease/app-google-release.aab
 
       - name: Upload Huawei App Bundle
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.6.1
         with:
           name: huaweiBundle
           path: android/app/build/outputs/bundle/huaweiRelease/app-huawei-release.aab
 
       - name: Upload Backend Jar
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.6.1
         with:
           name: backendJar
           path: backend/app/build/libs/app-*.jar
@@ -112,7 +112,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Download App Bundle
-        uses: actions/[email protected].8
+        uses: actions/[email protected].9
         with:
           name: googleBundle
 
@@ -155,7 +155,7 @@ jobs:
     steps:
 
       - name: Download App Bundle
-        uses: actions/[email protected].8
+        uses: actions/[email protected].9
         with:
           name: huaweiBundle
 
@@ -186,7 +186,7 @@ jobs:
     steps:
 
       - name: Download Backend Jar
-        uses: actions/[email protected].8
+        uses: actions/[email protected].9
         with:
           name: backendJar
           path: artifact
@@ -210,12 +210,12 @@ jobs:
         run: echo "status=success" >> $GITHUB_OUTPUT
 
   UploadToAppStore:
-    runs-on: macos-14
+    runs-on: macos-15
     outputs:
       status: ${{ steps.status.outputs.status }}
     steps:
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@f3f5fec1f5562978457d820f6d6c83b81cac28a9
+        uses: Oztechan/Global/actions/setup-gradle-repo@9ebcfe7cd8670187e6dc14c539718b03d0c07d5b
 
       - name: Adding secret files
         uses: ./.github/actions/add-secret-files

android/core/ad/src/google/AndroidManifest.xml

@@ -17,7 +17,9 @@
             android:name="com.google.android.gms.ads.flag.OPTIMIZE_AD_LOADING"
             android:value="true" />
 
+
         <!-- TODO can be removed when Google ads updated with a fix, simply remove and build if error is persisting -->
+        <!-- currently it is fixed in higher version of gsm but it looks like gitlive uses old one so we still need to keep it here -->
         <property
             android:name="android.adservices.AD_SERVICES_CONFIG"
             android:resource="@xml/gma_ad_services_config"

android/core/ad/src/google/kotlin/com/oztechan/ccc/android/core/ad/AdManagerImpl.kt

@@ -5,6 +5,7 @@ import android.content.Context
 import android.os.Build
 import android.view.WindowManager
 import co.touchlab.kermit.Logger
+import com.google.android.gms.ads.AdListener
 import com.google.android.gms.ads.AdRequest
 import com.google.android.gms.ads.AdSize
 import com.google.android.gms.ads.AdView
@@ -112,6 +113,14 @@ internal class AdManagerImpl(context: Context) : AdManager {
         val adView = AdView(context).apply {
             setAdSize(finalAdSize)
             adUnitId = adId
+            adListener = object : AdListener() {
+                override fun onAdFailedToLoad(adError: LoadAdError) {
+                    super.onAdFailedToLoad(adError)
+                    Exception("AdManagerImpl getBannerAd onAdFailedToLoad ${adError.message}").let {
+                        Logger.e(it) { it.message.orEmpty() }
+                    }
+                }
+            }
             loadAd(adRequest)
         }
 

android/core/ad/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
     <uses-permission android:name="android.permission.INTERNET" />
 </manifest>

android/ui/mobile/android-ui-mobile.gradle.kts

@@ -20,6 +20,9 @@ android {
         compileOptions {
             sourceCompatibility = JAVA_VERSION
             targetCompatibility = JAVA_VERSION
+
+            // needed for gitlive remoteconfig, we have it in app module though
+            isCoreLibraryDesugaringEnabled = true
         }
     }
 
@@ -65,6 +68,9 @@ dependencies {
             implementation(koinCompose)
             implementation(lifecycleRuntime)
             implementation(splashScreen)
+            implementation(rootBeer)
+
+            coreLibraryDesugaring(androidDesugaring)
         }
 
         android.google.apply {

android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/main/MainActivity.kt

@@ -5,10 +5,10 @@ package com.oztechan.ccc.android.ui.mobile.content.main
 
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.net.toUri
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
@@ -18,10 +18,13 @@ import com.oztechan.ccc.android.core.ad.AdManager
 import com.oztechan.ccc.android.ui.mobile.BuildConfig
 import com.oztechan.ccc.android.ui.mobile.R
 import com.oztechan.ccc.android.ui.mobile.util.getThemeMode
+import com.oztechan.ccc.android.ui.mobile.util.isDeviceRooted
 import com.oztechan.ccc.android.ui.mobile.util.requestAppReview
 import com.oztechan.ccc.android.ui.mobile.util.resolveAndStartIntent
 import com.oztechan.ccc.android.ui.mobile.util.showDialog
 import com.oztechan.ccc.android.ui.mobile.util.updateBaseContextLocale
+import com.oztechan.ccc.client.core.analytics.AnalyticsManager
+import com.oztechan.ccc.client.core.analytics.model.UserProperty
 import com.oztechan.ccc.client.viewmodel.main.MainEffect
 import com.oztechan.ccc.client.viewmodel.main.MainViewModel
 import kotlinx.coroutines.flow.launchIn
@@ -34,6 +37,7 @@ class MainActivity : BaseActivity() {
 
     private val adManager: AdManager by inject()
     private val viewModel: MainViewModel by viewModel()
+    private val analyticsManager by inject<AnalyticsManager>()
 
     init {
         // use dark mode default for old devices
@@ -44,10 +48,16 @@ class MainActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen()
+
         super.onCreate(savedInstanceState)
+
         Logger.i { "MainActivity onCreate" }
+
         setContentView(R.layout.activity_main)
+
         adManager.initAds(this)
+        analyticsManager.setUserProperty(UserProperty.IsRooted(isDeviceRooted(this)))
+
         observeStates()
         observeEffects()
     }
@@ -93,7 +103,7 @@ class MainActivity : BaseActivity() {
         positiveButton = R.string.update,
         cancelable = isCancelable
     ) {
-        resolveAndStartIntent(Intent(Intent.ACTION_VIEW, Uri.parse(marketLink)))
+        resolveAndStartIntent(Intent(Intent.ACTION_VIEW, marketLink.toUri()))
     }
 
     private fun setDestination(fragmentId: Int) = with(getNavigationController()) {