Migrate to kmp

.github/workflows/android.yml → .github/workflows/tests.yml

@@ -1,4 +1,4 @@
-name: Build & Test
+name: Lint & Tests
 
 on:
   push:
@@ -32,7 +32,7 @@ jobs:
       - name: Static Analysis with lint
         run: ./gradlew clean lint
 
-  test:
+  unit-test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -45,11 +45,11 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Run Tests with Gradle
-        run: ./gradlew test
+        run: ./gradlew allTests
 
-  androidTest:
+  android-test:
     runs-on: ubuntu-latest
-    timeout-minutes: 55
+    timeout-minutes: 30
     strategy:
       matrix:
         api-level: [ 26, 30 ]
@@ -103,4 +103,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: test-reports-${{ matrix.api-level }}
-          path: '**/build/reports/androidTests'
+          path: '**/build/reports/androidTests'

.gitignore

@@ -13,6 +13,7 @@ bin/
 gen/
 out/
 build/
+.kotlin
 
 # Local configuration file (sdk path, etc)
 local.properties

app/build.gradle.kts → androidApp/build.gradle.kts

@@ -1,4 +1,3 @@
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
 plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.kotlinAndroid)
@@ -42,11 +41,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
     buildFeatures {
         compose = true
@@ -62,19 +61,11 @@ android {
 }
 
 dependencies {
+    implementation(project(":shared"))
 
     implementation(libs.core.ktx)
-    implementation(libs.lifecycle.runtime.ktx)
-    implementation(libs.lifecycle.viewmodel.compose)
-    implementation(libs.activity.compose)
-    implementation(platform(libs.compose.bom))
-    implementation(libs.ui)
-    implementation(libs.ui.graphics)
-    implementation(libs.ui.tooling.preview)
-    implementation(libs.material3)
+    implementation(libs.androidx.activity.compose)
     implementation(libs.coroutines)
-    implementation(libs.androidx.window)
-    implementation(libs.materialWindow)
     implementation(libs.navigation)
 
     ksp(libs.kotlin.inject.ksp)
@@ -89,6 +80,5 @@ dependencies {
     androidTestImplementation(libs.espresso.core)
     androidTestImplementation(platform(libs.compose.bom))
     androidTestImplementation(libs.ui.test.junit4)
-    debugImplementation(libs.ui.tooling)
     debugImplementation(libs.ui.test.manifest)
 }

app/src/androidTest/java/me/nasrabadiam/tictactoe/NavigationTests.kt → androidApp/src/androidTest/java/me/nasrabadiam/tictactoe/NavigationTests.kt

@@ -5,9 +5,7 @@ import androidx.compose.ui.test.hasContentDescription
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.lifecycle.SavedStateHandle
 import me.nasrabadiam.tictactoe.game.GameUseCase
-import me.nasrabadiam.tictactoe.game.ui.GameViewModel
 import me.nasrabadiam.tictactoe.home.HomeScreenTests.Companion.PLAY_WITH_A_FRIEND_BUTTON_TEXT
 import org.junit.Rule
 import org.junit.Test
@@ -18,11 +16,10 @@ class NavigationTests {
     val composeRule = createComposeRule()
 
     private val gameUseCase = GameUseCase()
-    private val gameViewModel = GameViewModel(gameUseCase, SavedStateHandle())
 
     @Test
     fun whenClickedOnPlayWithAFriendShouldOpenGameScreenInSoloMode(): Unit = with(composeRule) {
-        setContent { App(gameViewModel = { gameViewModel }) }
+        setContent { App(gameUseCase = { gameUseCase }) }
         val playWithAFriendButton =
             onNode(hasContentDescription(PLAY_WITH_A_FRIEND_BUTTON_TEXT))
         playWithAFriendButton.performClick()
@@ -34,7 +31,7 @@ class NavigationTests {
 
     @Test
     fun whenAppOpensShouldShowHomeRoute(): Unit = with(composeRule) {
-        setContent { App(gameViewModel = { gameViewModel }) }
+        setContent { App(gameUseCase = { gameUseCase }) }
         onNodeWithText(PLAY_WITH_A_FRIEND_BUTTON_TEXT).assertIsDisplayed()
     }
 }

app/src/androidTest/java/me/nasrabadiam/tictactoe/game/GameClickTests.kt → androidApp/src/androidTest/java/me/nasrabadiam/tictactoe/game/GameClickTests.kt

@@ -2,12 +2,12 @@ package me.nasrabadiam.tictactoe.game
 
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.lifecycle.SavedStateHandle
+import me.nasrabadiam.tictactoe.GameWindowSizeClass.COMPACT
 import me.nasrabadiam.tictactoe.assertPlayersCountEquals
 import me.nasrabadiam.tictactoe.clickOnCell
 import me.nasrabadiam.tictactoe.game.model.Player
 import me.nasrabadiam.tictactoe.game.ui.GameScreen
 import me.nasrabadiam.tictactoe.game.ui.GameViewModel
-import me.nasrabadiam.tictactoe.ui.GameWindowSizeClass.COMPACT
 import org.junit.Rule
 import org.junit.Test
 

app/src/androidTest/java/me/nasrabadiam/tictactoe/game/GameLogicTests.kt → androidApp/src/androidTest/java/me/nasrabadiam/tictactoe/game/GameLogicTests.kt

@@ -7,14 +7,14 @@ import androidx.compose.ui.test.isDisplayed
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.lifecycle.SavedStateHandle
 import me.nasrabadiam.tictactoe.DRAW_RESULT_STRING
+import me.nasrabadiam.tictactoe.GameWindowSizeClass.COMPACT
 import me.nasrabadiam.tictactoe.WINNER_CLICKABLE_CONTENT_DESCRIPTION
 import me.nasrabadiam.tictactoe.WINNER_RESULT_STRING
 import me.nasrabadiam.tictactoe.assertPlayersCountEquals
 import me.nasrabadiam.tictactoe.clickOnCell
 import me.nasrabadiam.tictactoe.game.model.Player
 import me.nasrabadiam.tictactoe.game.ui.GameScreen
 import me.nasrabadiam.tictactoe.game.ui.GameViewModel
-import me.nasrabadiam.tictactoe.ui.GameWindowSizeClass.COMPACT
 import org.junit.Rule
 import org.junit.Test
 

app/src/androidTest/java/me/nasrabadiam/tictactoe/game/GameScoreTests.kt → androidApp/src/androidTest/java/me/nasrabadiam/tictactoe/game/GameScoreTests.kt

@@ -8,11 +8,11 @@ import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.lifecycle.SavedStateHandle
+import me.nasrabadiam.tictactoe.GameWindowSizeClass.COMPACT
 import me.nasrabadiam.tictactoe.REPLAY_GAME_BUTTON_TEXT
 import me.nasrabadiam.tictactoe.clickOnCell
 import me.nasrabadiam.tictactoe.game.ui.GameScreen
 import me.nasrabadiam.tictactoe.game.ui.GameViewModel
-import me.nasrabadiam.tictactoe.ui.GameWindowSizeClass.COMPACT
 import org.junit.Rule
 import org.junit.Test
 

app/src/androidTest/java/me/nasrabadiam/tictactoe/game/GameTests.kt → androidApp/src/androidTest/java/me/nasrabadiam/tictactoe/game/GameTests.kt

@@ -11,6 +11,7 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.lifecycle.SavedStateHandle
 import me.nasrabadiam.tictactoe.DRAW_RESULT_STRING
+import me.nasrabadiam.tictactoe.GameWindowSizeClass.COMPACT
 import me.nasrabadiam.tictactoe.REPLAY_GAME_BUTTON_TEXT
 import me.nasrabadiam.tictactoe.RESTART_GAME_BUTTON_TEXT
 import me.nasrabadiam.tictactoe.WINNER_RESULT_STRING
@@ -21,7 +22,6 @@ import me.nasrabadiam.tictactoe.game.model.Player
 import me.nasrabadiam.tictactoe.game.ui.GameScreen
 import me.nasrabadiam.tictactoe.game.ui.GameViewModel
 import me.nasrabadiam.tictactoe.getCellTestTag
-import me.nasrabadiam.tictactoe.ui.GameWindowSizeClass.COMPACT
 import org.junit.Rule
 import org.junit.Test
 

app/src/androidTest/java/me/nasrabadiam/tictactoe/game/GameTurnTests.kt → androidApp/src/androidTest/java/me/nasrabadiam/tictactoe/game/GameTurnTests.kt

@@ -4,13 +4,13 @@ import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.lifecycle.SavedStateHandle
+import me.nasrabadiam.tictactoe.GameWindowSizeClass.COMPACT
 import me.nasrabadiam.tictactoe.REPLAY_GAME_BUTTON_TEXT
 import me.nasrabadiam.tictactoe.assertPlayersCountEquals
 import me.nasrabadiam.tictactoe.clickOnCell
 import me.nasrabadiam.tictactoe.game.model.Player
 import me.nasrabadiam.tictactoe.game.ui.GameScreen
 import me.nasrabadiam.tictactoe.game.ui.GameViewModel
-import me.nasrabadiam.tictactoe.ui.GameWindowSizeClass.COMPACT
 import org.junit.Rule
 import org.junit.Test
 

app/src/androidTest/java/me/nasrabadiam/tictactoe/home/HomeScreenTests.kt → androidApp/src/androidTest/java/me/nasrabadiam/tictactoe/home/HomeScreenTests.kt

@@ -4,8 +4,8 @@ import androidx.compose.ui.test.assertIsNotEnabled
 import androidx.compose.ui.test.hasContentDescription
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.performClick
+import me.nasrabadiam.tictactoe.GameWindowSizeClass.NORMAL
 import me.nasrabadiam.tictactoe.home.HomeEvent.PlayWithAFriend
-import me.nasrabadiam.tictactoe.ui.GameWindowSizeClass.NORMAL
 import org.junit.Rule
 import org.junit.Test
 

app/src/main/java/me/nasrabadiam/tictactoe/MainActivity.kt → androidApp/src/main/java/me/nasrabadiam/tictactoe/MainActivity.kt

@@ -4,7 +4,7 @@ import android.app.Activity
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import me.nasrabadiam.tictactoe.di.ApplicationComponent
+import androidx.activity.enableEdgeToEdge
 import me.nasrabadiam.tictactoe.di.scopes.ActivityScope
 import me.nasrabadiam.tictactoe.game.GameUseCase
 import me.tatarka.inject.annotations.Component
@@ -14,8 +14,8 @@ class MainActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
-        val activityComponent = ActivityComponent::class.create(activity = this)
+        enableEdgeToEdge()
+        val activityComponent = MainActivityComponent::class.create(activity = this)
         setContent { activityComponent.app() }
     }
 }
@@ -25,7 +25,7 @@ fun ApplicationComponent.Companion.from(activity: Activity): ApplicationComponen
 
 @Component
 @ActivityScope
-abstract class ActivityComponent(
+abstract class MainActivityComponent(
     @get:Provides val activity: ComponentActivity,
     @Component val applicationComponent: ApplicationComponent = ApplicationComponent.from(activity)
 ) {

app/src/main/java/me/nasrabadiam/tictactoe/TicTacToeApplication.kt → androidApp/src/main/java/me/nasrabadiam/tictactoe/TicTacToeApplication.kt

@@ -1,8 +1,6 @@
 package me.nasrabadiam.tictactoe
 
 import android.app.Application
-import me.nasrabadiam.tictactoe.di.ApplicationComponent
-import me.nasrabadiam.tictactoe.di.create
 
 class TicTacToeApplication : Application() {