Merge pull request #124 from VictorKabata/fix-decompression

Moved android and desktop code to shared module
VictorKabata · Sep 18, 2024 · 510ce8c · 510ce8c
2 parents c0696a1 + f8ec4e7
commit 510ce8c
Show file tree

Hide file tree

Showing 177 changed files with 138 additions and 249 deletions.
diff --git a/appAndroid/.gitignore b/appAndroid/.gitignore
diff --git a/appAndroid/build.gradle.kts b/appAndroid/build.gradle.kts
diff --git a/appAndroid/debug/app-debug.aab b/appAndroid/debug/app-debug.aab
diff --git a/appAndroid/libs/YouTubeAndroidPlayerApi.jar b/appAndroid/libs/YouTubeAndroidPlayerApi.jar
diff --git a/appAndroid/proguard-rules.pro b/appAndroid/proguard-rules.pro
diff --git a/appAndroid/release/app-release.aab b/appAndroid/release/app-release.aab
diff --git a/appAndroid/src/main/ic_launcher-playstore.png b/appAndroid/src/main/ic_launcher-playstore.png
diff --git a/appAndroid/src/main/res/values-night/themes.xml b/appAndroid/src/main/res/values-night/themes.xml
diff --git a/appAndroid/src/main/res/values/themes.xml b/appAndroid/src/main/res/values/themes.xml
diff --git a/appDesktop/build.gradle.kts b/appDesktop/build.gradle.kts
diff --git a/appDesktop/src/main/kotlin/com/vickbt/notflix/Main.kt b/appDesktop/src/main/kotlin/com/vickbt/notflix/Main.kt
diff --git a/appDesktop/src/main/kotlin/com/vickbt/notflix/ui/windows/MainWindow.kt b/appDesktop/src/main/kotlin/com/vickbt/notflix/ui/windows/MainWindow.kt
diff --git a/appiOS/Notflix.xcodeproj/project.pbxproj b/appiOS/Notflix.xcodeproj/project.pbxproj
@@ -283,7 +283,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode\n";
+			shellScript = "cd \"$SRCROOT/..\"\n./gradlew :composeApp:embedAndSignAppleFrameworkForXcode\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/shared/build.gradle.kts → composeApp/build.gradle.kts b/shared/build.gradle.kts → composeApp/build.gradle.kts
@@ -1,15 +1,20 @@
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 import com.codingfeline.buildkonfig.compiler.FieldSpec.Type.STRING
+import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {
     alias(libs.plugins.multiplatform)
-    alias(libs.plugins.android.library)
     alias(libs.plugins.kotlinX.serialization.plugin)
     alias(libs.plugins.buildKonfig)
     alias(libs.plugins.compose)
     alias(libs.plugins.compose.compiler)
-
     alias(libs.plugins.sqlDelight)
+
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.googleServices.plugin)
+    alias(libs.plugins.firebase.appDistribution.plugin)
+    alias(libs.plugins.firebase.crashlytics.plugin)
+    alias(libs.plugins.firebase.performance.plugin)
 }
 
 @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
@@ -33,11 +38,11 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(compose.runtime)
-            api(compose.foundation)
-            api(compose.material3)
-            api(compose.components.resources)
-            api(compose.materialIconsExtended)
+            implementation(compose.runtime)
+            implementation(compose.foundation)
+            implementation(compose.material3)
+            implementation(compose.components.resources)
+            implementation(compose.materialIconsExtended)
 
             implementation(libs.coroutines)
 
@@ -74,6 +79,14 @@ kotlin {
         androidMain.dependencies {
             implementation(libs.ktor.android)
             implementation(libs.sqlDelight.android)
+            implementation(libs.koin.android)
+            implementation(libs.koin.androidx.compose)
+            implementation(libs.androidX.activity)
+
+            // Firebase
+            implementation(libs.firebase.analytics)
+            implementation(libs.firebase.crashlytics)
+            implementation(libs.firebase.performance)
         }
 
         iosMain.dependencies {
@@ -85,6 +98,7 @@ kotlin {
             implementation(libs.ktor.java)
             implementation(libs.sqlDelight.jvm)
             implementation(libs.coroutines.swing)
+            implementation(compose.desktop.currentOs)
         }
 
         sourceSets["desktopTest"].dependencies {}
@@ -94,18 +108,68 @@ kotlin {
 android {
     compileSdk = 34
     defaultConfig {
+        applicationId = "com.vickbt.notflix"
+
         minSdk = 24
+        targetSdk = compileSdk
+        versionCode = if (System.getenv("VERSION_CODE").isNullOrEmpty()) {
+            1
+        } else {
+            System.getenv("VERSION_CODE").toInt()
+        }
+        versionName = if (System.getenv("VERSION_NAME").isNullOrEmpty()) {
+            "1.0.0"
+        } else {
+            System.getenv("VERSION_NAME")?.toString()
+        }
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+
+        getByName("debug") {
+            isMinifyEnabled = false
+        }
     }
-    namespace = "com.vickbt.shared"
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
 
+    buildFeatures {
+        compose = true
+    }
+
+    namespace = "com.vickbt.notflix"
+
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     sourceSets["main"].res.srcDirs("src/androidMain/res")
     sourceSets["main"].resources.srcDirs("src/commonMain/resources")
+
+    dependencies {
+        debugImplementation(libs.leakCanary)
+        implementation(platform(libs.firebase.bom))
+    }
+}
+
+compose.desktop {
+    application {
+        mainClass = "com.vickbt.notflix.MainKt"
+        nativeDistributions {
+            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
+            packageName = "Notflix"
+            packageVersion = "1.0.0"
+        }
+    }
 }
 
 buildkonfig {

diff --git a/appAndroid/google-services.json → composeApp/google-services.json b/appAndroid/google-services.json → composeApp/google-services.json