Merge pull request #72 from Halulkin/feat/github-actions

build: added github actions
ml-opensource · Sep 15, 2023 · 06e9ba7 · 06e9ba7
2 parents 663fbff + e044a21
commit 06e9ba7
Show file tree

Hide file tree

Showing 23 changed files with 59 additions and 35 deletions.
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -0,0 +1,32 @@
+name: Build and Test
+
+on:
+  pull_request:
+    branches:
+      - main
+    types:
+      - opened
+      - synchronize
+      - reopened
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: 17
+
+      - name: Spotless Check
+        run: ./gradlew spotlessCheck
+
+      - name: Detekt Check
+        run: ./gradlew detekt
+
+      - name: Run Tests
+        run: ./gradlew test
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -71,12 +71,12 @@ android {
         kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlin {
         jvmToolchain {
-            languageVersion.set(JavaLanguageVersion.of(JavaVersion.VERSION_11.toString()))
+            languageVersion.set(JavaLanguageVersion.of(JavaVersion.VERSION_17.toString()))
         }
     }
 
@@ -112,6 +112,7 @@ dependencies {
     implementation(libs.android.activity.compose)
     implementation(libs.android.lifecycle.viewmodel.compose)
     implementation(libs.bundles.google.accompanist)
+    implementation (libs.android.compose.ui.tooling.preview)
     debugImplementation(libs.android.compose.ui.tooling)
 
     // Injection

diff --git a/app/src/main/java/com/monstarlab/designsystem/components/AppTopBar.kt b/app/src/main/java/com/monstarlab/designsystem/components/AppTopBar.kt
@@ -17,7 +17,7 @@ import com.monstarlab.designsystem.theme.Theme
 fun AppTopBar(
     title: String,
     modifier: Modifier = Modifier,
-    onBackButtonClick: (() -> Unit)? = null,
+    onBackButtonClick: (() -> Unit)? = null
 ) {
     TopAppBar(
         modifier = modifier,

diff --git a/app/src/main/java/com/monstarlab/designsystem/components/appbutton/AppButton.kt b/app/src/main/java/com/monstarlab/designsystem/components/appbutton/AppButton.kt
@@ -27,7 +27,7 @@ fun AppButton(
     enabled: Boolean = true,
     isLoading: Boolean = false,
     type: AppButtonType = AppButtonType.Filled,
-    onClick: () -> Unit,
+    onClick: () -> Unit
 ) {
     when (type) {
         AppButtonType.Filled -> PrimaryButton(
@@ -67,7 +67,7 @@ private fun PrimaryButton(
     modifier: Modifier = Modifier,
     onClick: () -> Unit = {},
     enabled: Boolean = false,
-    content: @Composable RowScope.() -> Unit,
+    content: @Composable RowScope.() -> Unit
 ) {
     val colors = ButtonDefaults.buttonColors()
     Button(

diff --git a/app/src/main/java/com/monstarlab/designsystem/components/apptextfield/AppTextField.kt b/app/src/main/java/com/monstarlab/designsystem/components/apptextfield/AppTextField.kt
@@ -36,7 +36,7 @@ fun AppTextField(
     maxLines: Int = Int.MAX_VALUE,
     interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
     trailingIcon: @Composable (() -> Unit)? = null,
-    leadingIcon: @Composable (() -> Unit)? = null,
+    leadingIcon: @Composable (() -> Unit)? = null
 ) {
     Column {
         OutlinedTextField(

diff --git a/app/src/main/java/com/monstarlab/features/auth/data/repository/AuthRepositoryImpl.kt b/app/src/main/java/com/monstarlab/features/auth/data/repository/AuthRepositoryImpl.kt
@@ -14,4 +14,4 @@ class AuthRepositoryImpl @Inject constructor(
         val responseBody = api.postLogin(email, password)
         return responseBody.toAuthToken()
     }
-}
+}
diff --git a/app/src/main/java/com/monstarlab/features/auth/domain/repository/AuthRepository.kt b/app/src/main/java/com/monstarlab/features/auth/domain/repository/AuthRepository.kt
@@ -2,7 +2,6 @@ package com.monstarlab.features.auth.domain.repository
 
 import com.monstarlab.features.auth.domain.models.AuthToken
 
-
 interface AuthRepository {
-    suspend fun login(email: String, password: String) : AuthToken
-}
+    suspend fun login(email: String, password: String): AuthToken
+}
diff --git a/app/src/main/java/com/monstarlab/features/auth/injection/RepositoryModule.kt b/app/src/main/java/com/monstarlab/features/auth/injection/RepositoryModule.kt
@@ -14,5 +14,5 @@ interface RepositoryModule {
 
     @Binds
     @Singleton
-    fun bindAuthRepository(repositoryImpl: AuthRepositoryImpl) : AuthRepository
-}
+    fun bindAuthRepository(repositoryImpl: AuthRepositoryImpl): AuthRepository
+}
diff --git a/app/src/main/java/com/monstarlab/features/login/domain/usecase/LoginUseCase.kt b/app/src/main/java/com/monstarlab/features/login/domain/usecase/LoginUseCase.kt
@@ -14,5 +14,4 @@ class LoginUseCase @Inject constructor(
         authRepository.login(email, password)
         userRepository.get()
     }
-
 }
diff --git a/app/src/main/java/com/monstarlab/features/login/ui/LoginViewModel.kt b/app/src/main/java/com/monstarlab/features/login/ui/LoginViewModel.kt
@@ -38,8 +38,8 @@ class LoginViewModel @Inject constructor(
             _stateFlow.update { it.copy(isLoading = true) }
             val state = _stateFlow.value
             val result = loginUseCase(state.email, state.password)
-            _stateFlow.update { state ->
-                state.copy(
+            _stateFlow.update { loginState ->
+                loginState.copy(
                     error = result.exceptionOrNull()?.toError(),
                     isLoading = false,
                     isLoggedIn = result.isSuccess

diff --git a/app/src/main/java/com/monstarlab/features/main/MainActivity.kt b/app/src/main/java/com/monstarlab/features/main/MainActivity.kt
@@ -46,5 +46,4 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) {
             }
         }
     }
-
 }
diff --git a/...lab/features/main/MainActivityContract.kt → ...tarlab/features/main/MainActivityState.kt b/...lab/features/main/MainActivityContract.kt → ...tarlab/features/main/MainActivityState.kt
diff --git a/app/src/main/java/com/monstarlab/features/main/MainActivityViewModel.kt b/app/src/main/java/com/monstarlab/features/main/MainActivityViewModel.kt
@@ -35,5 +35,4 @@ class MainActivityViewModel @Inject constructor(
             )
         }
     }
-
-}
+}
diff --git a/app/src/main/java/com/monstarlab/features/nstack/domain/usecase/SetupNstackUseCase.kt b/app/src/main/java/com/monstarlab/features/nstack/domain/usecase/SetupNstackUseCase.kt
@@ -21,5 +21,4 @@ class SetupNstackUseCase @Inject constructor(
             }
         }
     }
-
-}
+}
diff --git a/...src/main/java/com/monstarlab/features/resources/data/repository/ResourceRepositoryImpl.kt b/...src/main/java/com/monstarlab/features/resources/data/repository/ResourceRepositoryImpl.kt
@@ -17,4 +17,4 @@ class ResourceRepositoryImpl @Inject constructor(
             resourcePreferenceStore.addAll(it)
         }
     }
-}
+}
diff --git a/app/src/main/java/com/monstarlab/features/resources/domain/repository/ResourceRepository.kt b/app/src/main/java/com/monstarlab/features/resources/domain/repository/ResourceRepository.kt
@@ -5,5 +5,3 @@ import com.monstarlab.features.resources.domain.model.Resource
 interface ResourceRepository {
     suspend fun get(): List<Resource>
 }
-
-
diff --git a/app/src/main/java/com/monstarlab/features/resources/injection/RepositoryModule.kt b/app/src/main/java/com/monstarlab/features/resources/injection/RepositoryModule.kt
@@ -14,5 +14,5 @@ interface RepositoryModule {
 
     @Binds
     @Singleton
-    fun bindResourceRepository(resourceRepository: ResourceRepositoryImpl) : ResourceRepository
-}
+    fun bindResourceRepository(resourceRepository: ResourceRepositoryImpl): ResourceRepository
+}
diff --git a/app/src/main/java/com/monstarlab/features/user/data/repository/UserRepositoryImpl.kt b/app/src/main/java/com/monstarlab/features/user/data/repository/UserRepositoryImpl.kt
@@ -10,7 +10,7 @@ import javax.inject.Inject
 class UserRepositoryImpl @Inject constructor(
     private val api: UsersApi,
     private val userPreferenceStore: UserPreferenceStore,
-)  : UserRepository {
+) : UserRepository {
 
     override suspend fun get(): User {
         return api.getUser().data.toUser().also {

diff --git a/app/src/main/java/com/monstarlab/features/user/domain/repository/UserRepository.kt b/app/src/main/java/com/monstarlab/features/user/domain/repository/UserRepository.kt
@@ -3,5 +3,5 @@ package com.monstarlab.features.user.domain.repository
 import com.monstarlab.features.user.domain.model.User
 
 interface UserRepository {
-    suspend fun get() : User
-}
+    suspend fun get(): User
+}
diff --git a/app/src/main/java/com/monstarlab/features/user/injection/RepositoryModule.kt b/app/src/main/java/com/monstarlab/features/user/injection/RepositoryModule.kt
@@ -14,6 +14,5 @@ interface RepositoryModule {
 
     @Binds
     @Singleton
-    fun bindUserRepository(repository: UserRepositoryImpl) : UserRepository
-
-}
+    fun bindUserRepository(repository: UserRepositoryImpl): UserRepository
+}
diff --git a/app/src/test/java/com/monstarlab/features/auth/domain/AuthRepositoryTest.kt b/app/src/test/java/com/monstarlab/features/auth/domain/AuthRepositoryTest.kt
@@ -51,7 +51,5 @@ internal class AuthRepositoryTest {
         // Assert
         assertEquals(expectedTokenResponseDTO.toAuthToken(), actualAuthToken)
         coVerify(exactly = 1) { mockAuthApi.postLogin(email, password) }
-
     }
-
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -33,7 +33,7 @@ subprojects {
         kotlin {
             target("**/*.kt")
             targetExclude("**/RateReminderActions.kt")
-            ktlint()
+            ktlint("0.40.0")
         }
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -72,6 +72,7 @@ android_compose_ui = { module = "androidx.compose.ui:ui" }
 android_compose_material = { module = "androidx.compose.material:material" }
 android_compose_ui_util = { module = "androidx.compose.ui:ui-util" }
 android_compose_ui_tooling = { module = "androidx.compose.ui:ui-tooling" }
+android_compose_ui_tooling_preview = { module = "androidx.compose.ui:ui-tooling-preview" }
 android_compose_runtime = { module = "androidx.compose.runtime:runtime-livedata" }
 android_compose_ui_test = { module = "androidx.compose.ui:ui-test-junit4" }
 android_compose_ui_test_manifest = { module = "androidx.compose.ui:ui-test-manifest" }