Don't release pages for snapshots

mpetuska · mpetuska · commit 50765e6d6cf9 · 2022-08-09T10:43:45.000+01:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -149,7 +149,7 @@ jobs:
   release-Dokka:
     runs-on: ubuntu-latest
     needs: [ build, resolve-version ]
-    if: ${{ github.event.inputs.skipPages != 'y' }}
+    if: ${{ github.event.inputs.skipPages != 'y' && needs.resolve-version.outputs.snapshot == 'false' }}
     env:
       VERSION: ${{ needs.resolve-version.outputs.version }}
     steps:
diff --git a/.github/workflows/resolve-version.yml b/.github/workflows/resolve-version.yml
@@ -10,6 +10,8 @@ on:
     outputs:
       version:
         value: ${{ jobs.resolve.outputs.version }}
+      snapshot:
+        value: ${{ jobs.resolve.outputs.version }}
 
 concurrency:
   cancel-in-progress: true
@@ -23,6 +25,7 @@ jobs:
       VERSION: ${{ inputs.desired-version }}
     outputs:
       version: ${{ steps.resolve.outputs.version }}
+      snapshot: ${{ steps.resolve.outputs.snapshot }}
     steps:
       - uses: actions/checkout@v3
       - name: Resolve
@@ -37,6 +40,11 @@ jobs:
           if [[ "$VERSION" != "$gradle_version" ]]; then
             echo "DIFF_VERSION=1" >> $GITHUB_ENV
           fi
+          if [[ "$VERSION" == *-SNAPSHOT ]]; then
+            echo "::set-output name=snapshot::true"
+          else
+            echo "::set-output name=snapshot::false"
+          fi
       - name: Report
         run: |
           echo "VERSION=${{ env.VERSION }}"
diff --git a/build-conventions/build.gradle.kts b/build-conventions/build.gradle.kts
@@ -41,3 +41,13 @@ tasks {
     }
   }
 }
+
+kotlin {
+  sourceSets {
+    all {
+      languageSettings {
+        optIn("org.jetbrains.compose.ExperimentalComposeLibrary")
+      }
+    }
+  }
+}
diff --git a/build-conventions/src/main/kotlin/convention.common.gradle.kts b/build-conventions/src/main/kotlin/convention.common.gradle.kts
@@ -33,7 +33,7 @@ idea {
 
 tasks {
   withType<Test> {
-    useJUnitPlatform()
+//    useJUnitPlatform()
   }
 }
 
diff --git a/build-conventions/src/main/kotlin/convention.library-android.gradle.kts b/build-conventions/src/main/kotlin/convention.library-android.gradle.kts
@@ -8,5 +8,6 @@ android {
   defaultConfig {
     minSdk = 21
     targetSdk = 31
+//    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
 }
diff --git a/build-conventions/src/main/kotlin/convention.library-compose.gradle.kts b/build-conventions/src/main/kotlin/convention.library-compose.gradle.kts
@@ -17,5 +17,21 @@ kotlin {
         implementation(compose.web.testUtils)
       }
     }
+    named("jvmTest") {
+      dependencies {
+        implementation(compose.desktop.currentOs)
+        implementation(compose.material)
+        implementation(compose.uiTestJUnit4)
+      }
+    }
+    named("androidTest") {
+      dependencies {
+//        implementation("androidx.compose.material:material:_")
+//        implementation("androidx.compose.ui:ui-test-junit4:_")
+//        implementation("androidx.test.espresso:espresso-core:_")
+//        implementation("androidx.test:runner:_")
+//        implementation("androidx.test:rules:_")
+      }
+    }
   }
 }
diff --git a/build-conventions/src/main/kotlin/convention.library-mpp.gradle.kts b/build-conventions/src/main/kotlin/convention.library-mpp.gradle.kts
@@ -28,12 +28,12 @@ kotlin {
     }
     named("jvmTest") {
       dependencies {
-        implementation(kotlin("test-junit5"))
+        implementation(kotlin("test-junit"))
       }
     }
     withName("androidTest") {
       dependencies {
-        implementation(kotlin("test-junit5"))
+        implementation(kotlin("test-junit"))
       }
     }
     all {
diff --git a/gradle/versions.properties b/gradle/versions.properties
@@ -6,31 +6,22 @@
 ####
 #### suppress inspection "SpellCheckingInspection" for whole file
 #### suppress inspection "UnusedProperty" for whole file
-
 #======================================= Plugins ========================================
 plugin.android=7.2.2
-
+version.org.jetbrains.compose..compose-gradle-plugin=1.1.1
 version.com.github.jakemarsden..git-hooks-gradle-plugin=0.0.2
-
-version.dev.petuska..klip=0.4.1
-
 version.gradle.plugin.com.github.jengelman.gradle.plugins..shadow=7.0.0
-
 version.io.github.gradle-nexus..publish-plugin=1.1.0
-
-version.io.gitlab.arturbosch.detekt..detekt-formatting=1.21.0
-
-version.io.gitlab.arturbosch.detekt..detekt-gradle-plugin=1.21.0
-
- version.klip=0.4.1
-
-version.org.jetbrains.compose..compose-gradle-plugin=1.1.1
-
+version.detekt=1.21.0
+version.klip=0.4.1
 version.org.jetbrains.dokka..dokka-gradle-plugin=1.7.10
-
 #====================================== Libraries =======================================
+version.androidx.compose=1.1.1
+version.androidx.compose.material=1.1.1
+version.androidx.compose.ui=1.1.1
+version.androidx.test.espresso=3.4.0
+version.androidx.test.rules=1.4.0
+version.androidx.test.runner=1.4.0
 version.kotlinx.serialization=1.3.3
-
 version.kotlin=1.6.10
-
 version.org.reduxkotlin..redux-kotlin=0.5.5
diff --git a/gradle/versions.rules b/gradle/versions.rules
@@ -1,2 +1,7 @@
 dev.petuska:klip*
             ^^^^
+androidx.compose*
+^^^^^^^^^^^^^^^^
+
+io.gitlab.arturbosch.detekt:*
+                     ^^^^^^
diff --git a/src/commonTest/kotlin/TestData.kt b/src/commonTest/kotlin/TestData.kt
@@ -0,0 +1,18 @@
+package org.reduxkotlin.compose
+
+import org.reduxkotlin.Reducer
+import org.reduxkotlin.reducerForActionType
+
+data class TestState(val name: String = "Biggus", val age: Int = 69)
+
+sealed interface TestAction {
+  data class Rename(val name: String) : TestAction
+  object CelebrateBirthday : TestAction
+}
+
+val TestReducer: Reducer<TestState> = reducerForActionType<TestState, TestAction> { state, action ->
+  when (action) {
+    is TestAction.Rename -> state.copy(name = action.name)
+    is TestAction.CelebrateBirthday -> state.copy(age = state.age + 1)
+  }
+}
diff --git a/src/jsTest/kotlin/StoreProviderTest.kt b/src/jsTest/kotlin/StoreProviderTest.kt
@@ -5,31 +5,16 @@ import org.jetbrains.compose.web.dom.Button
 import org.jetbrains.compose.web.dom.Text
 import org.jetbrains.compose.web.testutils.ComposeWebExperimentalTestsApi
 import org.jetbrains.compose.web.testutils.runTest
-import org.reduxkotlin.Reducer
 import org.reduxkotlin.createStore
-import org.reduxkotlin.reducerForActionType
 import org.w3c.dom.HTMLButtonElement
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 @OptIn(ComposeWebExperimentalTestsApi::class)
 class StoreProviderTest {
-  data class State(val name: String, val age: Int)
-  sealed interface Action {
-    data class Rename(val name: String) : Action
-    object CelebrateBirthday : Action
-  }
-
-  private val reducer: Reducer<State> = reducerForActionType<State, Action> { state, action ->
-    when (action) {
-      is Action.Rename -> state.copy(name = action.name)
-      is Action.CelebrateBirthday -> state.copy(age = state.age + 1)
-    }
-  }
-
   @Test
   fun selectTest() = runTest {
-    val store = createStore(reducer, State("Biggus", 69))
+    val store = createStore(TestReducer, TestState("Biggus", 69))
     composition {
       StoreProvider(store) {
         val name by selectState { name }
@@ -42,7 +27,7 @@ class StoreProviderTest {
 
   @Test
   fun dispatchTest() = runTest {
-    val store = createStore(reducer, State("Biggus", 69))
+    val store = createStore(TestReducer, TestState("Biggus", 69))
     composition {
       StoreProvider(store) {
         val name by selectState { name }
@@ -53,7 +38,7 @@ class StoreProviderTest {
         Button(attrs = {
           id("target")
           onClick {
-            dispatch(Action.CelebrateBirthday)
+            dispatch(TestAction.CelebrateBirthday)
           }
         }) { Text("$age") }
       }
diff --git a/src/jvmTest/kotlin/StoreProviderTest.kt b/src/jvmTest/kotlin/StoreProviderTest.kt
@@ -0,0 +1,62 @@
+package org.reduxkotlin.compose
+
+import androidx.compose.material.Button
+import androidx.compose.material.Text
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.test.assertTextEquals
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.performClick
+import kotlinx.coroutines.runBlocking
+import org.junit.Rule
+import org.reduxkotlin.createStore
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class StoreProviderTest {
+  @get:Rule
+  val compose = createComposeRule()
+
+  @Test
+  fun selectTest() = runBlocking {
+    val store = createStore(TestReducer, TestState("Biggus", 69))
+    compose.setContent {
+      StoreProvider(store) {
+        val name by selectState { name }
+        val age by selectState { age }
+        assertEquals(name, store.state.name)
+        assertEquals(age, store.state.age)
+      }
+    }
+    compose.awaitIdle()
+  }
+
+  @Test
+  fun dispatchTest(): Unit = runBlocking {
+    val store = createStore(TestReducer, TestState("Biggus", 69))
+    compose.setContent {
+      StoreProvider(store) {
+        val name by selectState { name }
+        val age by selectState { age }
+        assertEquals(name, store.state.name)
+        assertEquals(age, store.state.age)
+        val dispatch = rememberDispatcher()
+        Button(
+          onClick = {
+            dispatch(TestAction.CelebrateBirthday)
+          },
+          modifier = Modifier.testTag("target"),
+        ) { Text("$age") }
+      }
+    }
+    compose.awaitIdle()
+    val el = compose.onNodeWithTag("target")
+    val startAge = store.state.age
+    el.assertTextEquals("$startAge")
+    el.performClick()
+    compose.awaitIdle()
+    el.assertTextEquals("${startAge + 1}")
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -41,3 +41,13 @@ tasks {`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`}`
	`44`	`+`
	`45`	`+kotlin {`
	`46`	`+ sourceSets {`
	`47`	`+ all {`
	`48`	`+ languageSettings {`
	`49`	`+ optIn("org.jetbrains.compose.ExperimentalComposeLibrary")`
	`50`	`+ }`
	`51`	`+ }`
	`52`	`+ }`
	`53`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ idea {`
`33`	`33`
`34`	`34`	`tasks {`
`35`	`35`	`withType<Test> {`
`36`		`- useJUnitPlatform()`
	`36`	`+// useJUnitPlatform()`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,6 @@ android {`
`8`	`8`	`defaultConfig {`
`9`	`9`	`minSdk = 21`
`10`	`10`	`targetSdk = 31`
	`11`	`+// testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`11`	`12`	`}`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,21 @@ kotlin {`
`17`	`17`	`implementation(compose.web.testUtils)`
`18`	`18`	`}`
`19`	`19`	`}`
	`20`	`+ named("jvmTest") {`
	`21`	`+ dependencies {`
	`22`	`+ implementation(compose.desktop.currentOs)`
	`23`	`+ implementation(compose.material)`
	`24`	`+ implementation(compose.uiTestJUnit4)`
	`25`	`+ }`
	`26`	`+ }`
	`27`	`+ named("androidTest") {`
	`28`	`+ dependencies {`
	`29`	`+// implementation("androidx.compose.material:material:_")`
	`30`	`+// implementation("androidx.compose.ui:ui-test-junit4:_")`
	`31`	`+// implementation("androidx.test.espresso:espresso-core:_")`
	`32`	`+// implementation("androidx.test:runner:_")`
	`33`	`+// implementation("androidx.test:rules:_")`
	`34`	`+ }`
	`35`	`+ }`
`20`	`36`	`}`
`21`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,12 @@ kotlin {`
`28`	`28`	`}`
`29`	`29`	`named("jvmTest") {`
`30`	`30`	`dependencies {`
`31`		`- implementation(kotlin("test-junit5"))`
	`31`	`+ implementation(kotlin("test-junit"))`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`withName("androidTest") {`
`35`	`35`	`dependencies {`
`36`		`- implementation(kotlin("test-junit5"))`
	`36`	`+ implementation(kotlin("test-junit"))`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`all {`