chore: bump dependency versions

gyulavoros · gyulavoros · commit bbb200855be9 · 2021-02-10T20:49:06.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,8 +6,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.0.0")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
+        classpath("com.android.tools.build:gradle:$androidToolsBuildVersion")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
     }
 }
 
@@ -22,6 +22,9 @@ allprojects {
         kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.ExperimentalStdlibApi"
         kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
         kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.FlowPreview"
+        kotlinOptions.freeCompilerArgs += "-Xallow-jvm-ir-dependencies"
+
+        kotlinOptions.jvmTarget = "1.8"
     }
 }
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,14 +1,23 @@
+@file:Suppress("HasPlatformType")
+
+import java.util.Properties
+
 plugins {
     `kotlin-dsl`
     `kotlin-dsl-precompiled-script-plugins`
 }
 
 repositories {
     google()
-    jcenter()    
+    jcenter()
 }
 
+private val properties = Properties().apply { File("gradle.properties").inputStream().use { load(it) } }
+
+val androidToolsBuildVersion = properties.getProperty("androidToolsBuildVersion")
+val kotlinVersion = properties.getProperty("kotlinVersion")
+
 dependencies {
-    implementation("com.android.tools.build:gradle:4.0.0")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
+    implementation("com.android.tools.build:gradle:$androidToolsBuildVersion")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
 }
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
@@ -0,0 +1 @@
+gradle.properties
diff --git a/buildSrc/src/main/kotlin/Version.kt b/buildSrc/src/main/kotlin/Version.kt
@@ -0,0 +1,31 @@
+@file:Suppress("HasPlatformType")
+
+import java.io.File
+import java.util.Properties
+
+private val properties = Properties().apply { File("gradle.properties").inputStream().use { load(it) } }
+
+// Versions
+val androidToolsBuildVersion = properties.getProperty("androidToolsBuildVersion")
+val androidxActivityVersion = properties.getProperty("androidxActivityVersion")
+val androidxAppcompatVersion = properties.getProperty("androidxAppcompatVersion")
+val androidxConstraintLayoutVersion = properties.getProperty("androidxConstraintLayoutVersion")
+val androidxCoreVersion = properties.getProperty("androidxCoreVersion")
+val androidxDynamicAnimationVersion = properties.getProperty("androidxDynamicAnimationVersion")
+val androidxEspressoVersion = properties.getProperty("androidxEspressoVersion")
+val androidxJunitVersion = properties.getProperty("androidxJunitVersion")
+val androidxLifecycleVersion = properties.getProperty("androidxLifecycleVersion")
+val androidxRecyclerviewVersion = properties.getProperty("androidxRecyclerviewVersion")
+val arrowVersion = properties.getProperty("arrowVersion")
+val coroutinesVersion = properties.getProperty("coroutinesVersion")
+val junitVersion = properties.getProperty("junitVersion")
+val kotlinComposeVersion = properties.getProperty("kotlinComposeVersion")
+val kotlinVersion = properties.getProperty("kotlinVersion")
+val moshiVersion = properties.getProperty("moshiVersion")
+val okhttpVersion = properties.getProperty("okhttpVersion")
+val retrofitVersion = properties.getProperty("retrofitVersion")
+
+// Android
+val androidCompileSdkVersion = properties.getProperty("androidCompileSdkVersion").toInt()
+val androidMinSdkVersion = properties.getProperty("androidMinSdkVersion").toInt()
+val androidTargetSdkVersion = properties.getProperty("androidTargetSdkVersion").toInt()
diff --git a/buildSrc/src/main/kotlin/shared-android.gradle.kts b/buildSrc/src/main/kotlin/shared-android.gradle.kts
@@ -1,16 +1,15 @@
 plugins {
     id("com.android.application")
     id("kotlin-android")
-    id("kotlin-android-extensions")
     id("kotlin-kapt")
 }
 
 android {
-    compileSdkVersion(29)
+    compileSdkVersion(androidCompileSdkVersion)
 
     defaultConfig {
-        minSdkVersion(28)
-        targetSdkVersion(29)
+        minSdkVersion(androidMinSdkVersion)
+        targetSdkVersion(androidTargetSdkVersion)
         versionCode = 1
         versionName = "0.1.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -32,6 +31,7 @@ android {
         }
     }
 
+    @Suppress("UnstableApiUsage")
     compileOptions {
         kotlinOptions {
             jvmTarget = "1.8"
@@ -44,19 +44,19 @@ android {
 }
 
 dependencies {
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.2.0")
-    androidTestImplementation("androidx.test.ext:junit:1.1.1")
-    implementation("androidx.activity:activity-ktx:1.2.0-alpha06")
-    implementation("androidx.appcompat:appcompat:1.1.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.0.0-beta6")
-    implementation("androidx.core:core-ktx:1.3.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-alpha04")
-    implementation("androidx.recyclerview:recyclerview:1.1.0")
-    implementation("io.arrow-kt:arrow-optics:0.10.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:$androidxEspressoVersion")
+    androidTestImplementation("androidx.test.ext:junit:$androidxJunitVersion")
+    implementation("androidx.activity:activity-ktx:$androidxActivityVersion")
+    implementation("androidx.appcompat:appcompat:$androidxAppcompatVersion")
+    implementation("androidx.constraintlayout:constraintlayout:$androidxConstraintLayoutVersion")
+    implementation("androidx.core:core-ktx:$androidxCoreVersion")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:$androidxLifecycleVersion")
+    implementation("androidx.recyclerview:recyclerview:$androidxRecyclerviewVersion")
+    implementation("io.arrow-kt:arrow-optics:$arrowVersion")
     implementation(project(":composable-architecture"))
     implementation(project(":composable-architecture-android"))
-    kapt("io.arrow-kt:arrow-meta:0.10.5")
-    testImplementation("junit:junit:4.13")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.7")
+    kapt("io.arrow-kt:arrow-meta:$arrowVersion")
+    testImplementation("junit:junit:$junitVersion")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")
     testImplementation(project(":composable-architecture-test"))
 }
diff --git a/composable-architecture-android/build.gradle.kts b/composable-architecture-android/build.gradle.kts
@@ -4,18 +4,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion(29)
-    compileOptions {
-        kotlinOptions {
-            jvmTarget = "1.8"
-        }
-    }
+    compileSdkVersion(androidCompileSdkVersion)
     sourceSets["main"].java.srcDir("src/main/kotlin")
 }
 
 dependencies {
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.2.0")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0")
-    implementation("io.arrow-kt:arrow-optics:0.10.5")
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:$androidxLifecycleVersion")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$androidxLifecycleVersion")
+    implementation("io.arrow-kt:arrow-optics:$arrowVersion")
     implementation(project(":composable-architecture"))
 }
diff --git a/composable-architecture-test/build.gradle.kts b/composable-architecture-test/build.gradle.kts
@@ -3,8 +3,8 @@ plugins {
 }
 
 dependencies {
-    implementation("io.arrow-kt:arrow-optics:0.10.5")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.72")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.7")
+    implementation("io.arrow-kt:arrow-optics:$arrowVersion")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")
     implementation(project(":composable-architecture"))
 }
diff --git a/composable-architecture/build.gradle.kts b/composable-architecture/build.gradle.kts
@@ -4,11 +4,11 @@ plugins {
 }
 
 dependencies {
-    implementation("io.arrow-kt:arrow-optics:0.10.5")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.72")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7")
-    kaptTest("io.arrow-kt:arrow-meta:0.10.5")
-    testImplementation("com.squareup.moshi:moshi-kotlin:1.9.2")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.7")
+    implementation("io.arrow-kt:arrow-optics:$arrowVersion")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
+    kaptTest("io.arrow-kt:arrow-meta:$arrowVersion")
+    testImplementation("com.squareup.moshi:moshi-kotlin:$moshiVersion")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")
     testImplementation(project(":composable-architecture-test"))
 }
diff --git a/composable-architecture/src/main/kotlin/composablearchitecture/Store.kt b/composable-architecture/src/main/kotlin/composablearchitecture/Store.kt
@@ -64,7 +64,10 @@ class Store<State, Action> private constructor(
     }
 
     fun send(action: Action) {
-        require(Thread.currentThread().name.startsWith("main")) {
+        val currentThread = Thread.currentThread()
+        require(
+            currentThread.name.startsWith("main") || currentThread.name.contains("Test worker")
+        ) {
             "Sending actions from background threads is not allowed"
         }
 
diff --git a/examples/case-studies/build.gradle.kts b/examples/case-studies/build.gradle.kts
@@ -9,5 +9,5 @@ android {
 }
 
 dependencies {
-    implementation("androidx.dynamicanimation:dynamicanimation:1.0.0")
+    implementation("androidx.dynamicanimation:dynamicanimation:$androidxDynamicAnimationVersion")
 }
diff --git a/examples/search/build.gradle.kts b/examples/search/build.gradle.kts
@@ -9,23 +9,28 @@ android {
     @Suppress("UnstableApiUsage")
     buildFeatures {
         compose = true
+        aidl = false
+        renderScript = false
+        shaders = false
+    }
+    kotlinOptions {
+        useIR = true
     }
     composeOptions {
-        kotlinCompilerVersion = "1.3.70-dev-withExperimentalGoogleExtensions-20200424"
-        kotlinCompilerExtensionVersion = "0.1.0-dev13"
+        kotlinCompilerExtensionVersion = kotlinComposeVersion
     }
 }
 
 dependencies {
-    implementation("androidx.compose:compose-runtime:0.1.0-dev13")
-    implementation("androidx.ui:ui-layout:0.1.0-dev13")
-    implementation("androidx.ui:ui-material:0.1.0-dev13")
-    implementation("androidx.ui:ui-tooling:0.1.0-dev13")
-    implementation("com.squareup.okhttp3:okhttp:4.7.2")
-    implementation("com.squareup.retrofit2:converter-moshi:2.9.0")
-    implementation("com.squareup.retrofit2:retrofit:2.9.0")
+    implementation("androidx.compose.foundation:foundation:$kotlinComposeVersion")
+    implementation("androidx.compose.material:material:$kotlinComposeVersion")
+    implementation("androidx.compose.ui:ui-tooling:$kotlinComposeVersion")
+    implementation("androidx.compose.ui:ui:$kotlinComposeVersion")
+    implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
+    implementation("com.squareup.retrofit2:converter-moshi:$retrofitVersion")
+    implementation("com.squareup.retrofit2:retrofit:$retrofitVersion")
 }
 
 configurations.all {
-    resolutionStrategy.force("com.squareup.okhttp3:okhttp:4.7.2")
+    resolutionStrategy.force("com.squareup.okhttp3:okhttp:$okhttpVersion")
 }
diff --git a/examples/search/src/main/kotlin/composablearchitecture/example/search/ComposeSearchActivity.kt b/examples/search/src/main/kotlin/composablearchitecture/example/search/ComposeSearchActivity.kt
@@ -2,26 +2,28 @@ package composablearchitecture.example.search
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.Composable
-import androidx.compose.getValue
-import androidx.compose.launchInComposition
-import androidx.compose.setValue
-import androidx.compose.state
-import androidx.ui.core.Modifier
-import androidx.ui.core.setContent
-import androidx.ui.foundation.AdapterList
-import androidx.ui.foundation.Box
-import androidx.ui.foundation.Text
-import androidx.ui.foundation.TextField
-import androidx.ui.foundation.TextFieldValue
-import androidx.ui.graphics.Color
-import androidx.ui.layout.Column
-import androidx.ui.layout.Spacer
-import androidx.ui.layout.height
-import androidx.ui.material.Divider
-import androidx.ui.material.MaterialTheme
-import androidx.ui.res.stringResource
-import androidx.ui.unit.dp
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.Divider
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.setContent
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
 import composablearchitecture.Store
 import kotlinx.coroutines.flow.collect
 
@@ -40,29 +42,34 @@ class ComposeSearchActivity : AppCompatActivity() {
 
 @Composable
 fun SearchView(store: Store<SearchState, SearchAction>, readMe: String) {
-    var state by state { store.currentState }
+    val state = remember { mutableStateOf(store.currentState) }
 
-    launchInComposition {
-        store.states.collect { state = it }
+    LaunchedEffect("Store") {
+        store.states.collect {
+            state.value = it
+        }
     }
 
     MaterialTheme {
-        Column {
-            Box(padding = 16.dp) {
+        Box(Modifier.padding(16.dp)) {
+            Column {
                 Text(text = readMe)
                 Spacer(modifier = Modifier.height(16.dp))
-                val queryState = state { TextFieldValue("") }
                 TextField(
-                    value = queryState.value,
-                    onValueChange = {
-                        queryState.value = it
-                        store.send(SearchAction.SearchQueryChanged(it.text))
-                    }
+                    value = state.value.searchQuery,
+                    onValueChange = { store.send(SearchAction.SearchQueryChanged(it)) },
+                    modifier = Modifier.fillMaxWidth()
                 )
                 Divider(color = Color.Black)
                 Spacer(modifier = Modifier.height(16.dp))
-                AdapterList(data = state.locations) { location ->
-                    Text(text = location.title)
+                LazyColumn {
+                    items(state.value.locations) { location ->
+                        Text(
+                            text = location.title,
+                            modifier = Modifier.clickable {
+                                store.send(SearchAction.LocationTapped(location))
+                            })
+                    }
                 }
             }
         }
diff --git a/examples/tic-tac-toe/src/main/kotlin/composablearchitecture/example/tictactoe/TicTacToe.kt b/examples/tic-tac-toe/src/main/kotlin/composablearchitecture/example/tictactoe/TicTacToe.kt
@@ -96,9 +96,9 @@ data class Board(
     override fun toString(): String {
         return """
             |
-            |[${matrix[0][0] ?: ""}][${matrix[0][1] ?: ""}][${matrix[0][2] ?: ""}]
-            |[${matrix[1][0] ?: ""}][${matrix[1][1] ?: ""}][${matrix[1][2] ?: ""}]
-            |[${matrix[2][0] ?: ""}][${matrix[2][1] ?: ""}][${matrix[2][2] ?: ""}]
+            |[${matrix[0][0] ?: " "}][${matrix[0][1] ?: " "}][${matrix[0][2] ?: " "}]
+            |[${matrix[1][0] ?: " "}][${matrix[1][1] ?: " "}][${matrix[1][2] ?: " "}]
+            |[${matrix[2][0] ?: " "}][${matrix[2][1] ?: " "}][${matrix[2][2] ?: " "}]
             |
     """.trimMargin()
     }
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,33 @@
+# Gradle
 org.gradle.jvmargs=-Xmx2048m
 
+# Gradle Kotlin
 kotlin.code.style=official
 
+# Gradle Android
 android.useAndroidX=true
-android.enableJetifier=true
+
+# Versions
+androidToolsBuildVersion=7.0.0-alpha05
+androidxActivityVersion=1.1.0
+androidxAppcompatVersion=1.2.0
+androidxConstraintLayoutVersion=2.0.4
+androidxCoreVersion=1.3.2
+androidxDynamicAnimationVersion=1.0.0
+androidxEspressoVersion=3.3.0
+androidxJunitVersion=1.1.2
+androidxLifecycleVersion=2.2.0
+androidxRecyclerviewVersion=1.1.0
+arrowVersion=0.11.0
+coroutinesVersion=1.4.2
+junitVersion=4.13.1
+kotlinComposeVersion=1.0.0-alpha11
+kotlinVersion=1.4.21-2
+moshiVersion=1.11.0
+okhttpVersion=4.9.0
+retrofitVersion=2.9.0
+
+# Android
+androidCompileSdkVersion=29
+androidMinSdkVersion=28
+androidTargetSdkVersion=29
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ buildscript {`
`6`	`6`	`jcenter()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath("com.android.tools.build:gradle:4.0.0")`
`10`		`- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")`
	`9`	`+ classpath("com.android.tools.build:gradle:$androidToolsBuildVersion")`
	`10`	`+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
`@@ -22,6 +22,9 @@ allprojects {`
`22`	`22`	`kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.ExperimentalStdlibApi"`
`23`	`23`	`kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"`
`24`	`24`	`kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.FlowPreview"`
	`25`	`+ kotlinOptions.freeCompilerArgs += "-Xallow-jvm-ir-dependencies"`
	`26`	`+`
	`27`	`+ kotlinOptions.jvmTarget = "1.8"`
`25`	`28`	`}`
`26`	`29`	`}`
`27`	`30`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`dependencies {`
`6`		`- implementation("io.arrow-kt:arrow-optics:0.10.5")`
`7`		`- implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.72")`
`8`		`- implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.7")`
	`6`	`+ implementation("io.arrow-kt:arrow-optics:$arrowVersion")`
	`7`	`+ implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")`
	`8`	`+ implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")`
`9`	`9`	`implementation(project(":composable-architecture"))`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,10 @@ class Store<State, Action> private constructor(`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`fun send(action: Action) {`
`67`		`- require(Thread.currentThread().name.startsWith("main")) {`
	`67`	`+ val currentThread = Thread.currentThread()`
	`68`	`+ require(`
	`69`	`+ currentThread.name.startsWith("main") \|\| currentThread.name.contains("Test worker")`
	`70`	`+ ) {`
`68`	`71`	`"Sending actions from background threads is not allowed"`
`69`	`72`	`}`
`70`	`73`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@ android {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
`12`		`- implementation("androidx.dynamicanimation:dynamicanimation:1.0.0")`
	`12`	`+ implementation("androidx.dynamicanimation:dynamicanimation:$androidxDynamicAnimationVersion")`
`13`	`13`	`}`