Develop -> Main

.github/workflows/build.yml

@@ -1,6 +1,7 @@
 name: Build
 
 on:
+  workflow_dispatch:
   pull_request:
     branches: [ main, develop ]
 
@@ -14,10 +15,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - name: Make gradle executable
         run: chmod +x ./gradlew

.github/workflows/maintenance.yml

@@ -14,10 +14,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - name: Make gradle executable
         run: chmod +x ./gradlew

.gitignore

@@ -8,4 +8,7 @@
 /captures
 .externalNativeBuild
 .cxx
-local.properties
+local.properties
+app-ios/Pods
+/iosApp.xcodeproj
+*.plist

app-android/build.gradle.kts

@@ -4,70 +4,41 @@ plugins {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 34
+    namespace = "com.vickikbt.kmp_template"
 
     defaultConfig {
-        applicationId = "com.company.kmp_template.android"
+        applicationId = "com.vickikbt.kmp_template"
         minSdk = 21
         targetSdk = compileSdk
         versionCode = 1
         versionName = "1.0.0"
     }
+
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
         }
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    kotlin {
+        jvmToolchain(11)
     }
 
     buildFeatures {
         compose = true
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.0"
+        kotlinCompilerExtensionVersion = "1.5.1"
     }
 }
 
 dependencies {
-    api(project(":shared"))
-
-    implementation(libs.kotlin.stdlib)
-    implementation(libs.androidX.core)
-
-    implementation(libs.material)
-
-    implementation(libs.compose.ui)
-    implementation(libs.compose.material)
-    implementation(libs.compose.tooling)
-    implementation(libs.compose.runtime)
-    implementation(libs.compose.util)
-    implementation(libs.compose.activity)
-
-    implementation(libs.lifecycle.runtime)
-
-    // Koin-Dependency injection
-    implementation(libs.koin.android)
-    implementation(libs.koin.compose)
-
-    // Compose Navigation-Navigation between various screens
-    implementation(libs.navigation.compose)
-
-    testImplementation(libs.jUnitKtx)
-    testImplementation(libs.kotlinX.coroutines.test)
-    testImplementation(libs.mockk)
-    testImplementation(libs.kotlin.test)
-    testImplementation(libs.archTestCore)
-    testImplementation(libs.robolectric)
-
-    androidTestImplementation(libs.test.rules)
-    androidTestImplementation(libs.test.runner)
+    implementation(project(":shared"))
 }

app-android/src/main/AndroidManifest.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.vickikbt.kmptemplate.android">
+    <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
-        android:name=".AndroidApplication"
+        android:name="com.vickikbt.kmptemplate.AndroidApplication"
         android:allowBackup="false"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".ui.activities.MainActivity"
+            android:name="com.vickikbt.kmptemplate.ui.activities.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app-android/src/main/java/com/vickikbt/kmptemplate/AndroidApplication.kt

@@ -0,0 +1,5 @@
+package com.vickikbt.kmptemplate
+
+import android.app.Application
+
+class AndroidApplication : Application()

app-android/src/main/java/com/vickikbt/kmptemplate/ui/activities/MainActivity.kt

@@ -0,0 +1,21 @@
+package com.vickikbt.kmptemplate.ui.activities
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.foundation.ExperimentalFoundationApi
+import com.vickikbt.kmptemplate.ui.screens.MainScreen
+
+@ExperimentalFoundationApi
+@ExperimentalAnimationApi
+class MainActivity : ComponentActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContent {
+            MainScreen()
+        }
+    }
+}

app-desktop/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.jvm)
-    alias(libs.plugins.compose.desktop.plugin)
+    // alias(libs.plugins.compose.desktop.plugin)
+    alias(libs.plugins.compose)
 }
 
 dependencies {

app-desktop/src/main/kotlin/DesktopApplication.kt

@@ -1,14 +1,8 @@
 import androidx.compose.ui.window.application
-import com.vickikbt.kmptemplate.di.initKoin
-import org.koin.core.Koin
-import ui.screens.MainScreen
-
-lateinit var koin: Koin
+import ui.screens.MainWindow
 
 fun main() {
-    koin = initKoin(isDebug = false).koin
-
     return application {
-        MainScreen(applicationScope = this)
+        MainWindow(applicationScope = this)
     }
 }

app-desktop/src/main/kotlin/ui/screens/MainScreen.kt → app-desktop/src/main/kotlin/ui/screens/MainWindow.kt

@@ -1,24 +1,16 @@
 package ui.screens
 
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.ApplicationScope
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.WindowPosition
 import androidx.compose.ui.window.rememberWindowState
-import com.vickikbt.kmptemplate.presentation.viewmodels.MainViewModel
-import koin
+import com.vickikbt.kmptemplate.ui.screens.MainScreen
 
 @Composable
-fun MainScreen(applicationScope: ApplicationScope, viewModel: MainViewModel = koin.get()) {
-    val greeting = viewModel.greeting.collectAsState().value
-
+fun MainWindow(applicationScope: ApplicationScope) {
     Window(
         onCloseRequest = { applicationScope.exitApplication() },
         title = "KMP Template",
@@ -28,10 +20,6 @@ fun MainScreen(applicationScope: ApplicationScope, viewModel: MainViewModel = ko
             height = 400.dp, // or Dp.Unspecified,
         )
     ) {
-        Box(modifier = Modifier.fillMaxSize()) {
-            greeting?.let {
-                Text(modifier = Modifier.align(Alignment.Center), text = it)
-            }
-        }
+        MainScreen()
     }
 }

app-ios/Podfile

@@ -0,0 +1,4 @@
+target 'iosApp' do
+  use_frameworks!
+  platform :ios, '14.1'
+end

app-ios/Podfile.lock

@@ -0,0 +1,3 @@
+PODFILE CHECKSUM: c704cc38a3d632ad261a61e65c347dd9f9f4188f
+
+COCOAPODS: 1.12.1