Merge remote-tracking branch 'origin/develop'

Oztechan · Nov 21, 2023 · 9a69302 · 9a69302
2 parents b520b5f + 442f6cc
commit 9a69302
Show file tree

Hide file tree

Showing 86 changed files with 1,841 additions and 1,012 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -65,7 +65,7 @@ jobs:
     steps:
 
       - name: Clone Repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           submodules: 'recursive'
           fetch-depth: 0
@@ -109,7 +109,7 @@ jobs:
 
       - name: Set Job Status
         id: status
-        run: echo "::set-output name=status::success"
+        run: echo "status=success" >> $GITHUB_OUTPUT
 
   DistributeAndroid:
     runs-on: ubuntu-latest
@@ -120,7 +120,7 @@ jobs:
     steps:
 
       - name: Clone Repo # Needed for reading commit message for Firebase App Distribution
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Download Android Artifacts
         uses: actions/download-artifact@v3.0.2
@@ -150,7 +150,7 @@ jobs:
 
       - name: Set Job Status
         id: status
-        run: echo "::set-output name=status::success"
+        run: echo "status=success" >> $GITHUB_OUTPUT
 
   XCodeBuild:
     runs-on: macos-13
@@ -159,7 +159,7 @@ jobs:
     steps:
 
       - name: Clone Repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           submodules: 'recursive'
           fetch-depth: 0
@@ -208,7 +208,7 @@ jobs:
 
       - name: Set Job Status
         id: status
-        run: echo "::set-output name=status::success"
+        run: echo "status=success" >> $GITHUB_OUTPUT
 
   DistributeIOS:
     runs-on: macos-13
@@ -218,7 +218,7 @@ jobs:
       status: ${{ steps.status.outputs.status }}
     steps:
       - name: Clone Repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Download iOS IPA
         uses: actions/download-artifact@v3.0.2
@@ -237,7 +237,7 @@ jobs:
 
       - name: Set Job Status
         id: status
-        run: echo "::set-output name=status::success"
+        run: echo "status=success" >> $GITHUB_OUTPUT
 
   Quality:
     runs-on: macos-13
@@ -246,7 +246,7 @@ jobs:
     steps:
 
       - name: Clone Repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           submodules: 'recursive'
 
@@ -273,7 +273,7 @@ jobs:
 
       - name: Set Job Status
         id: status
-        run: echo "::set-output name=status::success"
+        run: echo "status=success" >> $GITHUB_OUTPUT
 
   UploadQualityReports:
     runs-on: ubuntu-latest
@@ -282,7 +282,7 @@ jobs:
       status: ${{ steps.status.outputs.status }}
     steps:
       - name: Clone Repo # Codecov requires it
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Download Coverage Report
         uses: actions/download-artifact@v3.0.2
@@ -320,7 +320,7 @@ jobs:
 
       - name: Set Job Status
         id: status
-        run: echo "::set-output name=status::success"
+        run: echo "status=success" >> $GITHUB_OUTPUT
 
   CodeAnalysis:
     runs-on: ubuntu-latest
@@ -329,7 +329,7 @@ jobs:
     steps:
 
       - name: Clone Repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           submodules: 'recursive'
 
@@ -353,7 +353,7 @@ jobs:
 
       - name: Set Job Status
         id: status
-        run: echo "::set-output name=status::success"
+        run: echo "status=success" >> $GITHUB_OUTPUT
 
   Notify:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -21,7 +21,7 @@ jobs:
 
       - name: Set Job Status
         id: status
-        run: echo "::set-output name=status::success"
+        run: echo "status=success" >> $GITHUB_OUTPUT
 
   Notify:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -60,7 +60,7 @@ jobs:
     steps:
 
       - name: Clone Repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           submodules: 'recursive'
           fetch-depth: 0
@@ -109,7 +109,7 @@ jobs:
 
       - name: Set Job Status
         id: status
-        run: echo "::set-output name=status::success"
+        run: echo "status=success" >> $GITHUB_OUTPUT
 
   UploadToGooglePlay:
     runs-on: ubuntu-latest
@@ -144,7 +144,7 @@ jobs:
 
       - name: Set Job Status
         id: status
-        run: echo "::set-output name=status::success"
+        run: echo "status=success" >> $GITHUB_OUTPUT
 
   UploadToHuaweiAppGallery:
     runs-on: ubuntu-latest
@@ -175,7 +175,7 @@ jobs:
 
       - name: Set Job Status
         id: status
-        run: echo "::set-output name=status::success"
+        run: echo "status=success" >> $GITHUB_OUTPUT
 
   DeployToServer:
     runs-on: ubuntu-latest
@@ -206,15 +206,15 @@ jobs:
 
       - name: Set Job Status
         id: status
-        run: echo "::set-output name=status::success"
+        run: echo "status=success" >> $GITHUB_OUTPUT
 
   UploadToAppStore:
     runs-on: macos-13
     outputs:
       status: ${{ steps.status.outputs.status }}
     steps:
       - name: Clone Repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           submodules: 'recursive'
           fetch-depth: 0
@@ -240,7 +240,7 @@ jobs:
 
       - name: Set Job Status
         id: status
-        run: echo "::set-output name=status::success"
+        run: echo "status=success" >> $GITHUB_OUTPUT
 
   Notify:
     runs-on: ubuntu-latest

diff --git a/CCC.gradle.kts b/CCC.gradle.kts
@@ -6,29 +6,18 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     libs.plugins.apply {
+        alias(kotlinMultiplatform).apply(false)
+        alias(kotlinJvm).apply(false)
+        alias(kotlinAndroid).apply(false)
+        alias(androidApplication).apply(false)
+        alias(androidLibrary).apply(false)
+        alias(buildKonfig).apply(false)
+        alias(sqlDelight).apply(false)
         alias(kover)
         alias(detekt)
     }
 }
 
-buildscript {
-    dependencies {
-        libs.classpaths.apply {
-            classpath(androidGradlePlugin)
-            classpath(kotlinGradlePlugin)
-            classpath(gsm)
-            classpath(firebasePerPlugin)
-            classpath(crashlytics)
-            classpath(navigation) // todo can be removed once compose migration done
-            classpath(kotlinSerialization)
-            classpath(sqlDelight)
-            classpath(mokoResources)
-            classpath(buildKonfig)
-            classpath(kover)
-        }
-    }
-}
-
 group = ProjectSettings.PROJECT_ID
 version = ProjectSettings.getVersionName(project)
 
@@ -80,6 +69,8 @@ allprojects {
     }
     tasks.withType<KotlinCompile> {
         kotlinOptions {
+            // todo remove when not needed anymore
+            freeCompilerArgs += "-Xexpect-actual-classes"
             allWarningsAsErrors = true
         }
     }

diff --git a/README.md b/README.md
@@ -37,6 +37,8 @@ graph TD;
     common-->backend(backend)
     
     submodule{submodule}
+
+    test
 ```
 
 All the modules in the project are grouped into 6 targets:
@@ -45,6 +47,7 @@ All the modules in the project are grouped into 6 targets:
 - `client` is a KMM module that shared between `ios` and `android`.
 - `common` is a KMP modules that shared between all the platforms (`android`, `ios` and `backend`)
 - `submodule` these are different git repositories and can be used in any of these modules. (arrows are not shown for the sake of simplicity)
+- `test` contains test cases for architecture and coding conventions
 
 ## How to clone
 

diff --git a/android/app/android-app.gradle.kts b/android/app/android-app.gradle.kts
@@ -9,11 +9,11 @@ import config.key.secret
 
 plugins {
     libs.plugins.apply {
-        id(androidApp.get().pluginId)
-        id(crashlytics.get().pluginId)
-        id(googleServices.get().pluginId)
-        id(firebasePerPlugin.get().pluginId)
-        id(android.get().pluginId)
+        alias(androidApplication)
+        alias(kotlinAndroid)
+        alias(googleServices)
+        alias(firebasePerPlugin)
+        alias(firebaseCrashlyticsPlugin)
     }
 }
 

diff --git a/android/core/ad/android-core-ad.gradle.kts b/android/core/ad/android-core-ad.gradle.kts
@@ -9,8 +9,8 @@ import config.key.string
 
 plugins {
     libs.plugins.apply {
-        id(androidLib.get().pluginId)
-        id(android.get().pluginId)
+        alias(androidLibrary)
+        alias(kotlinAndroid)
     }
 }
 

diff --git a/android/core/billing/android-core-billing.gradle.kts b/android/core/billing/android-core-billing.gradle.kts
@@ -3,8 +3,8 @@ import config.DeviceFlavour.Companion.implementation
 
 plugins {
     libs.plugins.apply {
-        id(androidLib.get().pluginId)
-        id(android.get().pluginId)
+        alias(androidLibrary)
+        alias(kotlinAndroid)
     }
 }
 

diff --git a/android/ui/mobile/android-ui-mobile.gradle.kts b/android/ui/mobile/android-ui-mobile.gradle.kts
@@ -3,9 +3,9 @@ import config.DeviceFlavour.Companion.implementation
 
 plugins {
     libs.plugins.apply {
-        id(androidLib.get().pluginId)
-        id(android.get().pluginId)
-        id(safeArgs.get().pluginId) // todo can be removed once compose migration done
+        alias(androidLibrary)
+        alias(kotlinAndroid)
+        alias(safeArgs) // todo can be removed once compose migration done
     }
 }
 

diff --git a/android/ui/mobile/src/test/kotlin/com/oztechan/ccc/android/ui/mobile/util/DeviceUtilTest.kt b/android/ui/mobile/src/test/kotlin/com/oztechan/ccc/android/ui/mobile/util/DeviceUtilTest.kt
@@ -5,7 +5,7 @@ import com.oztechan.ccc.client.core.shared.model.AppTheme
 import org.junit.Test
 import kotlin.test.assertEquals
 
-class DeviceUtilTest {
+internal class DeviceUtilTest {
     @Test
     fun getThemeMode() {
         assertEquals(

diff --git a/android/ui/widget/android-ui-widget.gradle.kts b/android/ui/widget/android-ui-widget.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     libs.plugins.apply {
-        id(androidLib.get().pluginId)
-        id(android.get().pluginId)
+        alias(androidLibrary)
+        alias(kotlinAndroid)
     }
 }
 

diff --git a/android/viewmodel/widget/android-viewmodel-widget.gradle.kts b/android/viewmodel/widget/android-viewmodel-widget.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     libs.plugins.apply {
-        id(androidLib.get().pluginId)
-        id(android.get().pluginId)
+        alias(androidLibrary)
+        alias(kotlinAndroid)
         alias(ksp)
     }
 }

diff --git a/...l/widget/src/test/kotlin/com/oztechan/ccc/android/viewmodel/widget/WidgetViewModelTest.kt b/...l/widget/src/test/kotlin/com/oztechan/ccc/android/viewmodel/widget/WidgetViewModelTest.kt
@@ -35,7 +35,7 @@ import kotlin.test.assertIs
 import kotlin.test.assertNotNull
 import kotlin.time.Duration.Companion.days
 
-class WidgetViewModelTest {
+internal class WidgetViewModelTest {
 
     private val viewModel: WidgetViewModel by lazy {
         WidgetViewModel(

diff --git a/backend/app/backend-app.gradle.kts b/backend/app/backend-app.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     libs.plugins.apply {
         application
-        id(jvm.get().pluginId)
+        alias(kotlinJvm)
         alias(ksp)
     }
 }

diff --git a/backend/controller/api/backend-controller-api.gradle.kts b/backend/controller/api/backend-controller-api.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     libs.plugins.apply {
-        id(jvm.get().pluginId)
+        alias(kotlinJvm)
         alias(ksp)
     }
 }

diff --git a/backend/controller/sync/backend-controller-sync.gradle.kts b/backend/controller/sync/backend-controller-sync.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id(libs.plugins.jvm.get().pluginId)
+    alias(libs.plugins.kotlinJvm)
 }
 
 dependencies {

diff --git a/backend/service/premium/backend-service-premium.gradle.kts b/backend/service/premium/backend-service-premium.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     libs.plugins.apply {
-        id(jvm.get().pluginId)
+        alias(kotlinJvm)
         alias(ksp)
     }
 }