- Add to Ci more projects

- Made order on the DSL part
galex · May 23, 2024 · 2567df1 · 2567df1
1 parent b933a3f
commit 2567df1
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,13 +14,13 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '17'
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v3
       - name: Generate kover coverage report
-        run: ./gradlew koverXmlReportDebug
+        run: ./gradlew :compiler-gradle-dsl:koverXmlReport :compiler-plugin:koverXmlReport :runtime:koverXmlReportDebug
       - name: Upload coverage reports to Codecov
         uses: codecov/[email protected]
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: ./runtime/build/reports/kover/reportDebug.xml,./runtime-channel/build/reports/kover/reportDebug.xml
+          files: ./compiler-gradle-dsl/build/reports/kover/report.xml,./compiler-plugin/build/reports/kover/report.xml,./runtime/build/reports/kover/reportDebug.xml
diff --git a/README.md b/README.md
@@ -83,7 +83,7 @@ In your libs.version.toml, add the following:
 
 ```toml
 [versions]
-yamvil = "<latest version>"
+yamvil = "0.0.2"
 
 [libraries]
 yamvil = { group = "dev.galex.yamvil", name = "runtime", version.ref = "yamvil" }

diff --git a/compiler-gradle-dsl/src/main/kotlin/dev/galex/yamvil/dsl/YamvilConfiguration.kt b/compiler-gradle-dsl/src/main/kotlin/dev/galex/yamvil/dsl/YamvilConfiguration.kt
@@ -12,7 +12,7 @@ open class YamvilConfiguration {
 class ComposeConfiguration {
     var screenSuffix = "Screen"
     var uiStateParameterName = "uiState"
-    var handleEventFunctionParameterMame = "handleEvent"
+    var handleEventParameterMame = "handleEvent"
 }
 
 
diff --git a/compiler-gradle-dsl/src/test/kotlin/dev/galex/yamvil/dsl/YamvilLevelTest.kt b/compiler-gradle-dsl/src/test/kotlin/dev/galex/yamvil/dsl/YamvilLevelTest.kt
@@ -11,9 +11,9 @@ class YamvilLevelTest {
         val config = YamvilConfiguration()
         // Then
         Truth.assertThat(config.level).isEqualTo(YamvilLevel.Error)
-        Truth.assertThat(config.screenSuffix).isEqualTo("Screen")
-        Truth.assertThat(config.uiStateParameterName).isEqualTo("uiState")
-        Truth.assertThat(config.uiEventFunctionParameterMame).isEqualTo("handleEvent")
+        Truth.assertThat(config.compose.screenSuffix).isEqualTo("Screen")
+        Truth.assertThat(config.compose.uiStateParameterName).isEqualTo("uiState")
+        Truth.assertThat(config.compose.handleEventParameterMame).isEqualTo("handleEvent")
     }
 
     @Test

diff --git a/compiler-plugin/src/main/kotlin/dev/galex/yamvil/checkers/ComposeScreensChecker.kt b/compiler-plugin/src/main/kotlin/dev/galex/yamvil/checkers/ComposeScreensChecker.kt
@@ -97,11 +97,11 @@ class ComposeScreensChecker(
         }
 
         // handleEvent parameter name
-        if (uiStateInfo?.uiEventParameter?.name != config.compose.handleEventFunctionParameterMame) {
+        if (uiStateInfo?.uiEventParameter?.name != config.compose.handleEventParameterMame) {
             reporter.reportOn(
                 source = declaration.source,
                 factory = YamvilFactories.renameHandleEventParameter(config.level),
-                a = "Please rename \"${uiStateInfo?.uiEventParameter?.name}\" to \"${config.compose.handleEventFunctionParameterMame}\"",
+                a = "Please rename \"${uiStateInfo?.uiEventParameter?.name}\" to \"${config.compose.handleEventParameterMame}\"",
                 context = context
             )
         }

diff --git a/samples/sample-android/app/build.gradle.kts b/samples/sample-android/app/build.gradle.kts
@@ -80,7 +80,9 @@ dependencies {
 
 yamvil {
     level = YamvilLevel.Error
-    screenSuffix = "Screen" // Default value is "Screen"
-    uiStateParameterName = "uiState" // Default value is "uiState"
-    uiEventFunctionParameterMame = "onEvent" // Default value is "handleEvent"
+    compose {
+        screenSuffix = "Screen" // Default value is "Screen"
+        uiStateParameterName = "uiState" // Default value is "uiState"
+        handleEventFunctionParameterMame = "onEvent" // Default value is "handleEvent"
+    }
 }
diff --git a/...android/app/src/main/kotlin/dev/galex/yamvil/sample/features/dashboard/DashboardScreen.kt b/...android/app/src/main/kotlin/dev/galex/yamvil/sample/features/dashboard/DashboardScreen.kt
@@ -5,27 +5,22 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import dev.galex.yamvil.compose.LaunchedActionEffect
 
-@Composable
-fun SomeScreen() {
-
-}
-
 @Composable
 fun DashboardScreen(
-    uiState: DashboardUiState,
-    onEvent: (DashboardUiEvent) -> Unit,
+    state: DashboardUiState,
+    handleEvent: (DashboardUiEvent) -> Unit,
     modifier: Modifier = Modifier
 ) {
-    LaunchedActionEffect(uiState) { action: DashboardUiAction ->
+    LaunchedActionEffect(state) { action: DashboardUiAction ->
         when (action) {
             DashboardUiAction.NavigateToNext -> {}
         }
     }
 
-    when (uiState.state) {
+    when (state.state) {
         is DashboardUiState.ContentState.Loading -> DashboardLoadingContent()
         is DashboardUiState.ContentState.Error -> DashboardErrorContent()
-        is DashboardUiState.ContentState.Content -> DashboardContent(uiState.state)
+        is DashboardUiState.ContentState.Content -> DashboardContent(state.state)
     }
 
     Text(text = "DashboardScreen")

diff --git a/...roid/app/src/main/kotlin/dev/galex/yamvil/sample/features/dashboard/DashboardViewModel.kt b/...roid/app/src/main/kotlin/dev/galex/yamvil/sample/features/dashboard/DashboardViewModel.kt
@@ -3,7 +3,7 @@ package dev.galex.yamvil.sample.features.dashboard
 import dev.galex.yamvil.models.base.Consumable
 import dev.galex.yamvil.viewmodels.MVIViewModel
 
-class DashboardViewModel: MVIViewModel<DashboardUiState, DashboardUiEvent>() {
+class DashboardViewModel2: MVIViewModel<DashboardUiState, DashboardUiEvent>() {
 
     override fun initializeUiState(): DashboardUiState {
         return DashboardUiState(state = DashboardUiState.ContentState.Loading)