From 022456ace3df26f77b33192b09f32cbfacde78fa Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Fri, 20 Nov 2020 14:38:10 -0700
Subject: [PATCH 1/9] to compose

---
 examples/android/build.gradle.kts             | 28 +++++-
 .../grpc/examples/helloworld/MainActivity.kt  | 94 +++++++++++++------
 .../src/main/res/layout/activity_main.xml     | 36 -------
 .../android/src/main/res/values/strings.xml   |  4 +-
 4 files changed, 96 insertions(+), 66 deletions(-)
 delete mode 100644 examples/android/src/main/res/layout/activity_main.xml

diff --git a/examples/android/build.gradle.kts b/examples/android/build.gradle.kts
index 07b9fc5a..77a69b0c 100644
--- a/examples/android/build.gradle.kts
+++ b/examples/android/build.gradle.kts
@@ -3,15 +3,25 @@ plugins {
     kotlin("android")
 }
 
+val composeVersion = "1.0.0-alpha03"
+
 dependencies {
     implementation(project(":stub-android"))
+    implementation(kotlin("stdlib"))
     implementation("androidx.appcompat:appcompat:1.3.1")
+    implementation("androidx.compose.foundation:foundation-layout:$composeVersion")
+    implementation("androidx.compose.material:material:$composeVersion")
+    implementation("androidx.compose.runtime:runtime:$composeVersion")
+    implementation("androidx.compose.ui:ui:$composeVersion")
+
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${rootProject.ext["coroutinesVersion"]}")
+
     runtimeOnly("io.grpc:grpc-okhttp:${rootProject.ext["grpcVersion"]}")
 }
 
 android {
     compileSdkVersion(30)
-    buildToolsVersion = "30.0.2"
+    buildToolsVersion = "30.0.3"
 
     defaultConfig {
         applicationId = "io.grpc.examples.hello"
@@ -34,4 +44,20 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
+
+    buildFeatures {
+        compose = true
+    }
+
+    composeOptions {
+        kotlinCompilerVersion = org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION.toString()
+        kotlinCompilerExtensionVersion = composeVersion
+    }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        freeCompilerArgs = listOf("-Xallow-jvm-ir-dependencies", "-Xskip-prerelease-check")
+    }
 }
diff --git a/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt b/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt
index ea9a35e6..eb651361 100644
--- a/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt
+++ b/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt
@@ -1,30 +1,51 @@
 package io.grpc.examples.helloworld
 
 import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.view.KeyEvent
-import android.widget.Button
-import android.widget.EditText
-import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
-import io.grpc.ManagedChannel
+import androidx.compose.foundation.Text
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ContextAmbient
+import androidx.compose.ui.platform.setContent
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.unit.dp
 import io.grpc.ManagedChannelBuilder
+<<<<<<< HEAD
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.asExecutor
 import kotlinx.coroutines.runBlocking
 import java.net.URL
 import java.util.logging.Logger
+=======
+import kotlinx.coroutines.*
+import java.net.URL
+>>>>>>> c586a91 (to compose)
 
-// todo: suspend funs
 class MainActivity : AppCompatActivity() {
-    private val logger = Logger.getLogger(this.javaClass.name)
 
-    private fun channel(): ManagedChannel {
-        val url = URL(resources.getString(R.string.server_url))
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContent {
+            Surface(color = MaterialTheme.colors.background) {
+                Greeter()
+            }
+        }
+    }
+}
+
+@Composable
+fun Greeter() {
+    val context = ContextAmbient.current
+
+    val channel = remember {
+        val url = URL(context.getString(R.string.server_url))
         val port = if (url.port == -1) url.defaultPort else url.port
 
-        logger.info("Connecting to ${url.host}:$port")
+        println("Connecting to ${url.host}:$port")
 
         val builder = ManagedChannelBuilder.forAddress(url.host, port)
         if (url.protocol == "https") {
@@ -33,18 +54,16 @@ class MainActivity : AppCompatActivity() {
             builder.usePlaintext()
         }
 
-        return builder.executor(Dispatchers.Default.asExecutor()).build()
+        builder.executor(Dispatchers.Default.asExecutor()).build()
     }
 
-    // lazy otherwise resources is null
-    private val greeter by lazy { GreeterGrpcKt.GreeterCoroutineStub(channel()) }
+    val greeter = GreeterGrpcKt.GreeterCoroutineStub(channel)
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+    val nameState = remember { mutableStateOf(TextFieldValue()) }
 
-        val button = findViewById<Button>(R.id.button)
+    val responseState = remember { mutableStateOf("") }
 
+<<<<<<< HEAD
         val nameText = findViewById<EditText>(R.id.name)
         nameText.addTextChangedListener(object : TextWatcher {
             override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
@@ -66,18 +85,39 @@ class MainActivity : AppCompatActivity() {
                 e.printStackTrace()
             }
         }
+=======
+    val scope = remember { CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate) }
+>>>>>>> c586a91 (to compose)
 
-        button.setOnClickListener {
-            sendReq()
+    onActive {
+        onDispose {
+            channel.shutdownNow()
+            scope.cancel()
         }
+    }
+
+    Column(Modifier.fillMaxWidth().fillMaxHeight(), Arrangement.Top, Alignment.CenterHorizontally) {
+        Text(context.getString(R.string.name_hint), modifier = Modifier.padding(top = 10.dp))
+        OutlinedTextField(nameState.value, { nameState.value = it })
 
-        nameText.setOnKeyListener { _, keyCode, event ->
-            if ((event.action == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) {
-                sendReq()
-                true
-            } else {
-                false
+        Button({
+            scope.launch {
+                try {
+                    val request = HelloRequest.newBuilder().setName(nameState.value.text).build()
+                    val response = greeter.sayHello(request)
+                    responseState.value = response.message
+                } catch (e: Exception) {
+                    responseState.value = e.message ?: "Unknown Error"
+                    e.printStackTrace()
+                }
             }
+        }, Modifier.padding(10.dp)) {
+            Text(context.getString(R.string.send_request))
+        }
+
+        if (responseState.value.isNotEmpty()) {
+            Text(context.getString(R.string.server_response), modifier = Modifier.padding(top = 10.dp))
+            Text(responseState.value)
         }
     }
 }
diff --git a/examples/android/src/main/res/layout/activity_main.xml b/examples/android/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 5ee34612..00000000
--- a/examples/android/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:gravity="center_horizontal"
-    tools:context="io.grpc.examples.helloworld.MainActivity">
-
-    <EditText android:id="@+id/name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputType="text"
-        android:hint="@string/name_hint"
-        android:autofillHints="name"/>
-
-    <Button android:id="@+id/button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/send_request"
-        android:enabled="false"/>
-
-    <TextView android:id="@+id/response_label"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_margin="5dp"
-        android:textSize="18sp"
-        android:text="@string/server_response"/>
-
-    <TextView android:id="@+id/response"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_marginHorizontal="5dp"/>
-
-</LinearLayout>
diff --git a/examples/android/src/main/res/values/strings.xml b/examples/android/src/main/res/values/strings.xml
index 92f6b72c..11c67b2b 100644
--- a/examples/android/src/main/res/values/strings.xml
+++ b/examples/android/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="name_hint">Name</string>
+    <string name="name_hint">Name:</string>
     <string name="send_request">Send gRPC Request</string>
     <string name="app_label">gRPC Kotlin Android</string>
-    <string name="server_response">Server response</string>
+    <string name="server_response">Server response: </string>
 </resources>

From 587917c3e0a584fd775f07330082b1e05719b940 Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Thu, 14 Oct 2021 05:27:05 -0600
Subject: [PATCH 2/9] bump compose and cleanup

---
 examples/README.md                            |   2 +-
 examples/android/build.gradle.kts             |   8 +-
 examples/android/gradle.properties            |   1 -
 .../grpc/examples/helloworld/MainActivity.kt  | 109 ++++++++----------
 examples/build.gradle.kts                     |   4 +-
 examples/gradle.properties                    |   1 +
 examples/settings.gradle.kts                  |   1 -
 examples/stub-android/build.gradle.kts        |   3 +-
 8 files changed, 60 insertions(+), 69 deletions(-)
 delete mode 100644 examples/android/gradle.properties

diff --git a/examples/README.md b/examples/README.md
index d0270ace..615d9850 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -82,7 +82,7 @@ The example sources are organized into the following top-level folders:
       mkdir cmdline-tools
       mv latest cmdline-tools
       cmdline-tools/latest/bin/sdkmanager --update
-      cmdline-tools/latest/bin/sdkmanager "platforms;android-30" "build-tools;30.0.2" "extras;google;m2repository" "extras;android;m2repository"
+      cmdline-tools/latest/bin/sdkmanager "platforms;android-30" "build-tools;30.0.3" "extras;google;m2repository" "extras;android;m2repository"
       cmdline-tools/latest/bin/sdkmanager --licenses
       ```
 
diff --git a/examples/android/build.gradle.kts b/examples/android/build.gradle.kts
index 77a69b0c..038fa25f 100644
--- a/examples/android/build.gradle.kts
+++ b/examples/android/build.gradle.kts
@@ -3,12 +3,14 @@ plugins {
     kotlin("android")
 }
 
-val composeVersion = "1.0.0-alpha03"
+val composeVersion = "1.0.3"
 
 dependencies {
     implementation(project(":stub-android"))
     implementation(kotlin("stdlib"))
+    implementation("androidx.activity:activity-compose:1.3.1")
     implementation("androidx.appcompat:appcompat:1.3.1")
+
     implementation("androidx.compose.foundation:foundation-layout:$composeVersion")
     implementation("androidx.compose.material:material:$composeVersion")
     implementation("androidx.compose.runtime:runtime:$composeVersion")
@@ -57,7 +59,7 @@ android {
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-        freeCompilerArgs = listOf("-Xallow-jvm-ir-dependencies", "-Xskip-prerelease-check")
+        // jvmTarget = JavaVersion.VERSION_11.toString()
+        // freeCompilerArgs = listOf("-Xallow-jvm-ir-dependencies", "-Xskip-prerelease-check")
     }
 }
diff --git a/examples/android/gradle.properties b/examples/android/gradle.properties
deleted file mode 100644
index 5bac8ac5..00000000
--- a/examples/android/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-android.useAndroidX=true
diff --git a/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt b/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt
index eb651361..1a702802 100644
--- a/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt
+++ b/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt
@@ -1,28 +1,36 @@
 package io.grpc.examples.helloworld
 
 import android.os.Bundle
+import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.foundation.Text
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.runtime.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Button
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.ContextAmbient
-import androidx.compose.ui.platform.setContent
+import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
 import io.grpc.ManagedChannelBuilder
-<<<<<<< HEAD
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.asExecutor
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
 import java.net.URL
-import java.util.logging.Logger
-=======
-import kotlinx.coroutines.*
-import java.net.URL
->>>>>>> c586a91 (to compose)
 
 class MainActivity : AppCompatActivity() {
 
@@ -31,18 +39,17 @@ class MainActivity : AppCompatActivity() {
 
         setContent {
             Surface(color = MaterialTheme.colors.background) {
-                Greeter()
+                val url = URL(stringResource(R.string.server_url))
+                GreeterEffect(url)
             }
         }
     }
 }
 
 @Composable
-fun Greeter() {
-    val context = ContextAmbient.current
+fun GreeterEffect(url: URL) {
 
     val channel = remember {
-        val url = URL(context.getString(R.string.server_url))
         val port = if (url.port == -1) url.defaultPort else url.port
 
         println("Connecting to ${url.host}:$port")
@@ -59,65 +66,47 @@ fun Greeter() {
 
     val greeter = GreeterGrpcKt.GreeterCoroutineStub(channel)
 
-    val nameState = remember { mutableStateOf(TextFieldValue()) }
-
     val responseState = remember { mutableStateOf("") }
 
-<<<<<<< HEAD
-        val nameText = findViewById<EditText>(R.id.name)
-        nameText.addTextChangedListener(object : TextWatcher {
-            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
-                button.isEnabled = s.isNotEmpty()
-            }
-            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { }
-            override fun afterTextChanged(s: Editable) { }
-        })
+    val scope = remember { CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate) }
 
-        val responseText = findViewById<TextView>(R.id.response)
+    DisposableEffect(LocalLifecycleOwner.current) {
+        onDispose {
+            channel.shutdownNow()
+            scope.cancel()
+        }
+    }
 
-        fun sendReq() = runBlocking {
+    Greeter(responseState.value) { name ->
+        scope.launch {
             try {
-                val request = helloRequest { name = nameText.text.toString() }
+                val request = helloRequest { this.name = name }
                 val response = greeter.sayHello(request)
-                responseText.text = response.message
+                responseState.value = response.message
             } catch (e: Exception) {
-                responseText.text = e.message
+                responseState.value = e.message ?: "Unknown Error"
                 e.printStackTrace()
             }
         }
-=======
-    val scope = remember { CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate) }
->>>>>>> c586a91 (to compose)
-
-    onActive {
-        onDispose {
-            channel.shutdownNow()
-            scope.cancel()
-        }
     }
+}
+
+@Composable
+fun Greeter(response: String, greet: (String) -> Unit) {
+
+    val nameState = remember { mutableStateOf(TextFieldValue()) }
 
     Column(Modifier.fillMaxWidth().fillMaxHeight(), Arrangement.Top, Alignment.CenterHorizontally) {
-        Text(context.getString(R.string.name_hint), modifier = Modifier.padding(top = 10.dp))
+        Text(stringResource(R.string.name_hint), modifier = Modifier.padding(top = 10.dp))
         OutlinedTextField(nameState.value, { nameState.value = it })
 
-        Button({
-            scope.launch {
-                try {
-                    val request = HelloRequest.newBuilder().setName(nameState.value.text).build()
-                    val response = greeter.sayHello(request)
-                    responseState.value = response.message
-                } catch (e: Exception) {
-                    responseState.value = e.message ?: "Unknown Error"
-                    e.printStackTrace()
-                }
-            }
-        }, Modifier.padding(10.dp)) {
-            Text(context.getString(R.string.send_request))
-        }
+        Button({ greet(nameState.value.text) }, Modifier.padding(10.dp)) {
+        Text(stringResource(R.string.send_request))
+    }
 
-        if (responseState.value.isNotEmpty()) {
-            Text(context.getString(R.string.server_response), modifier = Modifier.padding(top = 10.dp))
-            Text(responseState.value)
+        if (response.isNotEmpty()) {
+            Text(stringResource(R.string.server_response), modifier = Modifier.padding(top = 10.dp))
+            Text(response)
         }
     }
 }
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 9fbcc247..f211bb92 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-    id("com.android.application") version "4.1.1" apply false
+    id("com.android.application") version "4.2.0" apply false
     id("com.google.protobuf") version "0.8.17" apply false
-    kotlin("jvm") version "1.5.31" apply false
+    kotlin("jvm") version "1.5.30" apply false
     id("org.jlleitschuh.gradle.ktlint") version "10.2.0"
 }
 
diff --git a/examples/gradle.properties b/examples/gradle.properties
index 66929e69..cc362365 100644
--- a/examples/gradle.properties
+++ b/examples/gradle.properties
@@ -1 +1,2 @@
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
+android.useAndroidX=true
diff --git a/examples/settings.gradle.kts b/examples/settings.gradle.kts
index 236dd64e..edecd861 100644
--- a/examples/settings.gradle.kts
+++ b/examples/settings.gradle.kts
@@ -10,7 +10,6 @@ if (startParameter.taskRequests.find { it.args.contains("assemble") } == null) {
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        jcenter()
         google()
     }
 
diff --git a/examples/stub-android/build.gradle.kts b/examples/stub-android/build.gradle.kts
index 97602427..96046b87 100644
--- a/examples/stub-android/build.gradle.kts
+++ b/examples/stub-android/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
 
 android {
     compileSdkVersion(30)
-    buildToolsVersion = "30.0.2"
+    buildToolsVersion = "30.0.3"
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
@@ -34,6 +34,7 @@ android {
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
     kotlinOptions {
         freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn")
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
 }
 

From df6265ca7eb54bb334d974a2c8e36eb89c6a99d2 Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Thu, 14 Oct 2021 15:17:58 -0600
Subject: [PATCH 3/9] move service out of composable

---
 .../grpc/examples/helloworld/MainActivity.kt  | 57 +++++++++----------
 1 file changed, 26 insertions(+), 31 deletions(-)

diff --git a/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt b/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt
index 1a702802..42e66826 100644
--- a/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt
+++ b/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt
@@ -14,12 +14,10 @@ import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
@@ -30,6 +28,7 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.asExecutor
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
+import java.io.Closeable
 import java.net.URL
 
 class MainActivity : AppCompatActivity() {
@@ -37,19 +36,23 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        val url = URL(resources.getString(R.string.server_url))
+        val greeterService = GreeterService(url) // todo: better resource open & closing
+
         setContent {
             Surface(color = MaterialTheme.colors.background) {
-                val url = URL(stringResource(R.string.server_url))
-                GreeterEffect(url)
+                Greeter(greeterService)
             }
         }
     }
 }
 
-@Composable
-fun GreeterEffect(url: URL) {
+class GreeterService(url: URL) : Closeable {
+    val responseState = mutableStateOf("")
 
-    val channel = remember {
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
+
+    private val channel = let {
         val port = if (url.port == -1) url.defaultPort else url.port
 
         println("Connecting to ${url.host}:$port")
@@ -64,35 +67,27 @@ fun GreeterEffect(url: URL) {
         builder.executor(Dispatchers.Default.asExecutor()).build()
     }
 
-    val greeter = GreeterGrpcKt.GreeterCoroutineStub(channel)
-
-    val responseState = remember { mutableStateOf("") }
+    private val greeter = GreeterGrpcKt.GreeterCoroutineStub(channel)
 
-    val scope = remember { CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate) }
-
-    DisposableEffect(LocalLifecycleOwner.current) {
-        onDispose {
-            channel.shutdownNow()
-            scope.cancel()
+    fun sayHello(name: String) = scope.launch {
+        try {
+            val request = helloRequest { this.name = name }
+            val response = greeter.sayHello(request)
+            responseState.value = response.message
+        } catch (e: Exception) {
+            responseState.value = e.message ?: "Unknown Error"
+            e.printStackTrace()
         }
     }
 
-    Greeter(responseState.value) { name ->
-        scope.launch {
-            try {
-                val request = helloRequest { this.name = name }
-                val response = greeter.sayHello(request)
-                responseState.value = response.message
-            } catch (e: Exception) {
-                responseState.value = e.message ?: "Unknown Error"
-                e.printStackTrace()
-            }
-        }
+    override fun close() {
+        channel.shutdownNow()
+        scope.cancel()
     }
 }
 
 @Composable
-fun Greeter(response: String, greet: (String) -> Unit) {
+fun Greeter(greeterService: GreeterService) {
 
     val nameState = remember { mutableStateOf(TextFieldValue()) }
 
@@ -100,13 +95,13 @@ fun Greeter(response: String, greet: (String) -> Unit) {
         Text(stringResource(R.string.name_hint), modifier = Modifier.padding(top = 10.dp))
         OutlinedTextField(nameState.value, { nameState.value = it })
 
-        Button({ greet(nameState.value.text) }, Modifier.padding(10.dp)) {
+        Button({ greeterService.sayHello(nameState.value.text) }, Modifier.padding(10.dp)) {
         Text(stringResource(R.string.send_request))
     }
 
-        if (response.isNotEmpty()) {
+        if (greeterService.responseState.value.isNotEmpty()) {
             Text(stringResource(R.string.server_response), modifier = Modifier.padding(top = 10.dp))
-            Text(response)
+            Text(greeterService.responseState.value)
         }
     }
 }

From 80af4b654f2f16381e0dbae3ad169d4df683844e Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Thu, 14 Oct 2021 15:48:32 -0600
Subject: [PATCH 4/9] cleanup

---
 .../grpc/examples/helloworld/MainActivity.kt  | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt b/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt
index 42e66826..552e7dcd 100644
--- a/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt
+++ b/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt
@@ -1,5 +1,6 @@
 package io.grpc.examples.helloworld
 
+import android.net.Uri
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
@@ -16,28 +17,25 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
 import io.grpc.ManagedChannelBuilder
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.asExecutor
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import java.io.Closeable
-import java.net.URL
 
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val url = URL(resources.getString(R.string.server_url))
-        val greeterService = GreeterService(url) // todo: better resource open & closing
+        val uri = Uri.parse(resources.getString(R.string.server_url))
+        val greeterService = GreeterService(uri) // todo: better resource open & closing
 
         setContent {
             Surface(color = MaterialTheme.colors.background) {
@@ -47,18 +45,14 @@ class MainActivity : AppCompatActivity() {
     }
 }
 
-class GreeterService(url: URL) : Closeable {
+class GreeterService(uri: Uri) : Closeable {
     val responseState = mutableStateOf("")
 
-    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
-
     private val channel = let {
-        val port = if (url.port == -1) url.defaultPort else url.port
-
-        println("Connecting to ${url.host}:$port")
+        println("Connecting to ${uri.host}:${uri.port}")
 
-        val builder = ManagedChannelBuilder.forAddress(url.host, port)
-        if (url.protocol == "https") {
+        val builder = ManagedChannelBuilder.forAddress(uri.host, uri.port)
+        if (uri.scheme == "https") {
             builder.useTransportSecurity()
         } else {
             builder.usePlaintext()
@@ -69,7 +63,7 @@ class GreeterService(url: URL) : Closeable {
 
     private val greeter = GreeterGrpcKt.GreeterCoroutineStub(channel)
 
-    fun sayHello(name: String) = scope.launch {
+    suspend fun sayHello(name: String) {
         try {
             val request = helloRequest { this.name = name }
             val response = greeter.sayHello(request)
@@ -82,20 +76,21 @@ class GreeterService(url: URL) : Closeable {
 
     override fun close() {
         channel.shutdownNow()
-        scope.cancel()
     }
 }
 
 @Composable
 fun Greeter(greeterService: GreeterService) {
 
+    val scope = rememberCoroutineScope()
+
     val nameState = remember { mutableStateOf(TextFieldValue()) }
 
     Column(Modifier.fillMaxWidth().fillMaxHeight(), Arrangement.Top, Alignment.CenterHorizontally) {
         Text(stringResource(R.string.name_hint), modifier = Modifier.padding(top = 10.dp))
         OutlinedTextField(nameState.value, { nameState.value = it })
 
-        Button({ greeterService.sayHello(nameState.value.text) }, Modifier.padding(10.dp)) {
+        Button({ scope.launch { greeterService.sayHello(nameState.value.text) } }, Modifier.padding(10.dp)) {
         Text(stringResource(R.string.send_request))
     }
 

From d18fbbe47a55319dde65c2b3eca406b87420e4a6 Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Thu, 14 Oct 2021 15:50:44 -0600
Subject: [PATCH 5/9] rename GreeterService

---
 .../io/grpc/examples/helloworld/MainActivity.kt      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt b/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt
index 552e7dcd..39c76063 100644
--- a/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt
+++ b/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt
@@ -35,7 +35,7 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         val uri = Uri.parse(resources.getString(R.string.server_url))
-        val greeterService = GreeterService(uri) // todo: better resource open & closing
+        val greeterService = GreeterRCP(uri) // todo: better resource open & closing
 
         setContent {
             Surface(color = MaterialTheme.colors.background) {
@@ -45,7 +45,7 @@ class MainActivity : AppCompatActivity() {
     }
 }
 
-class GreeterService(uri: Uri) : Closeable {
+class GreeterRCP(uri: Uri) : Closeable {
     val responseState = mutableStateOf("")
 
     private val channel = let {
@@ -80,7 +80,7 @@ class GreeterService(uri: Uri) : Closeable {
 }
 
 @Composable
-fun Greeter(greeterService: GreeterService) {
+fun Greeter(greeterRCP: GreeterRCP) {
 
     val scope = rememberCoroutineScope()
 
@@ -90,13 +90,13 @@ fun Greeter(greeterService: GreeterService) {
         Text(stringResource(R.string.name_hint), modifier = Modifier.padding(top = 10.dp))
         OutlinedTextField(nameState.value, { nameState.value = it })
 
-        Button({ scope.launch { greeterService.sayHello(nameState.value.text) } }, Modifier.padding(10.dp)) {
+        Button({ scope.launch { greeterRCP.sayHello(nameState.value.text) } }, Modifier.padding(10.dp)) {
         Text(stringResource(R.string.send_request))
     }
 
-        if (greeterService.responseState.value.isNotEmpty()) {
+        if (greeterRCP.responseState.value.isNotEmpty()) {
             Text(stringResource(R.string.server_response), modifier = Modifier.padding(top = 10.dp))
-            Text(greeterService.responseState.value)
+            Text(greeterRCP.responseState.value)
         }
     }
 }

From 9cc37c68348dd75388b1d68c052478875b4b9bc1 Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Thu, 14 Oct 2021 16:13:41 -0600
Subject: [PATCH 6/9] better resource mgmt - maybe

---
 .../io/grpc/examples/helloworld/MainActivity.kt     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt b/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt
index 39c76063..bdea1817 100644
--- a/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt
+++ b/examples/android/src/main/kotlin/io/grpc/examples/helloworld/MainActivity.kt
@@ -31,18 +31,23 @@ import java.io.Closeable
 
 class MainActivity : AppCompatActivity() {
 
+    private val uri by lazy { Uri.parse(resources.getString(R.string.server_url)) }
+    private val greeterService by lazy { GreeterRCP(uri) }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val uri = Uri.parse(resources.getString(R.string.server_url))
-        val greeterService = GreeterRCP(uri) // todo: better resource open & closing
-
         setContent {
             Surface(color = MaterialTheme.colors.background) {
                 Greeter(greeterService)
             }
         }
     }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        greeterService.close()
+    }
 }
 
 class GreeterRCP(uri: Uri) : Closeable {
@@ -58,7 +63,7 @@ class GreeterRCP(uri: Uri) : Closeable {
             builder.usePlaintext()
         }
 
-        builder.executor(Dispatchers.Default.asExecutor()).build()
+        builder.executor(Dispatchers.IO.asExecutor()).build()
     }
 
     private val greeter = GreeterGrpcKt.GreeterCoroutineStub(channel)

From 25c35dac5869660520dac14ebd440163dc7506f3 Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Mon, 20 Dec 2021 12:21:33 -0700
Subject: [PATCH 7/9] bump android versions

---
 examples/README.md                            |  4 +++-
 examples/android/build.gradle.kts             | 20 +++++++++----------
 examples/android/src/main/AndroidManifest.xml | 13 ++++++------
 examples/build.gradle.kts                     |  8 ++++----
 examples/client/build.gradle.kts              |  5 +++++
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 examples/native-client/build.gradle.kts       |  5 +++++
 examples/server/build.gradle.kts              |  5 +++++
 examples/stub-android/build.gradle.kts        | 10 +++++-----
 examples/stub-lite/build.gradle.kts           |  1 +
 examples/stub/build.gradle.kts                |  1 +
 11 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/examples/README.md b/examples/README.md
index 615d9850..8dd47205 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -62,6 +62,8 @@ The example sources are organized into the following top-level folders:
 - <details>
   <summary>Android example</summary>
 
+  *NOTE: You must use JDK 11 or higher*
+
   Start the server:
 
   ```sh
@@ -82,7 +84,7 @@ The example sources are organized into the following top-level folders:
       mkdir cmdline-tools
       mv latest cmdline-tools
       cmdline-tools/latest/bin/sdkmanager --update
-      cmdline-tools/latest/bin/sdkmanager "platforms;android-30" "build-tools;30.0.3" "extras;google;m2repository" "extras;android;m2repository"
+      cmdline-tools/latest/bin/sdkmanager "platforms;android-31" "build-tools;31.0.0" "extras;google;m2repository" "extras;android;m2repository"
       cmdline-tools/latest/bin/sdkmanager --licenses
       ```
 
diff --git a/examples/android/build.gradle.kts b/examples/android/build.gradle.kts
index 038fa25f..c49157d0 100644
--- a/examples/android/build.gradle.kts
+++ b/examples/android/build.gradle.kts
@@ -3,13 +3,13 @@ plugins {
     kotlin("android")
 }
 
-val composeVersion = "1.0.3"
+val composeVersion = "1.0.5"
 
 dependencies {
     implementation(project(":stub-android"))
     implementation(kotlin("stdlib"))
-    implementation("androidx.activity:activity-compose:1.3.1")
-    implementation("androidx.appcompat:appcompat:1.3.1")
+    implementation("androidx.activity:activity-compose:1.4.0")
+    implementation("androidx.appcompat:appcompat:1.4.0")
 
     implementation("androidx.compose.foundation:foundation-layout:$composeVersion")
     implementation("androidx.compose.material:material:$composeVersion")
@@ -22,13 +22,13 @@ dependencies {
 }
 
 android {
-    compileSdkVersion(30)
-    buildToolsVersion = "30.0.3"
+    compileSdkVersion(31)
+    buildToolsVersion = "31.0.0"
 
     defaultConfig {
         applicationId = "io.grpc.examples.hello"
         minSdkVersion(26)
-        targetSdkVersion(30)
+        targetSdkVersion(31)
         versionCode = 1
         versionName = "1.0"
 
@@ -43,8 +43,8 @@ android {
     sourceSets["main"].java.srcDir("src/main/kotlin")
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     buildFeatures {
@@ -52,14 +52,12 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerVersion = org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION.toString()
         kotlinCompilerExtensionVersion = composeVersion
     }
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     kotlinOptions {
-        // jvmTarget = JavaVersion.VERSION_11.toString()
-        // freeCompilerArgs = listOf("-Xallow-jvm-ir-dependencies", "-Xskip-prerelease-check")
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
 }
diff --git a/examples/android/src/main/AndroidManifest.xml b/examples/android/src/main/AndroidManifest.xml
index 4e123ac8..8b8e7f7a 100644
--- a/examples/android/src/main/AndroidManifest.xml
+++ b/examples/android/src/main/AndroidManifest.xml
@@ -4,13 +4,14 @@
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
-        android:allowBackup="true"
-        android:fullBackupContent="true"
-        android:icon="@android:drawable/btn_star"
-        android:label="@string/app_label">
+            android:allowBackup="true"
+            android:fullBackupContent="true"
+            android:icon="@android:drawable/btn_star"
+            android:label="@string/app_label">
         <activity
-            android:theme="@style/Theme.AppCompat.NoActionBar"
-            android:name="io.grpc.examples.helloworld.MainActivity">
+                android:theme="@style/Theme.AppCompat.NoActionBar"
+                android:name="io.grpc.examples.helloworld.MainActivity"
+                android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 7fbce09e..47f54f1c 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -1,14 +1,14 @@
 plugins {
-    id("com.android.application") version "4.2.0" apply false
-    id("com.google.protobuf") version "0.8.17" apply false
-    kotlin("jvm") version "1.5.30" apply false
+    id("com.android.application") version "7.0.2" apply false
+    id("com.google.protobuf") version "0.8.18" apply false
+    kotlin("jvm") version "1.5.31" apply false // Compose Compiler required version
     id("org.jlleitschuh.gradle.ktlint") version "10.2.0"
 }
 
 // todo: move to subprojects, but how?
 ext["grpcVersion"] = "1.39.0" // need to wait for grpc kotlin to move past this
 ext["grpcKotlinVersion"] = "1.2.0" // CURRENT_GRPC_KOTLIN_VERSION
-ext["protobufVersion"] = "3.18.1"
+ext["protobufVersion"] = "3.19.1"
 ext["coroutinesVersion"] = "1.5.2"
 
 allprojects {
diff --git a/examples/client/build.gradle.kts b/examples/client/build.gradle.kts
index a1a4534f..0c7f8a42 100644
--- a/examples/client/build.gradle.kts
+++ b/examples/client/build.gradle.kts
@@ -3,6 +3,11 @@ plugins {
     kotlin("jvm")
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
 dependencies {
     implementation(project(":stub"))
     runtimeOnly("io.grpc:grpc-netty:${rootProject.ext["grpcVersion"]}")
diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index ffed3a25..d2880ba8 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/native-client/build.gradle.kts b/examples/native-client/build.gradle.kts
index 0dcb64fb..dfc66776 100644
--- a/examples/native-client/build.gradle.kts
+++ b/examples/native-client/build.gradle.kts
@@ -4,6 +4,11 @@ plugins {
     id("com.palantir.graal") version "0.7.2"
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
 dependencies {
     implementation(project(":stub-lite"))
     runtimeOnly("io.grpc:grpc-okhttp:${rootProject.ext["grpcVersion"]}")
diff --git a/examples/server/build.gradle.kts b/examples/server/build.gradle.kts
index 741c2015..7a27fde6 100644
--- a/examples/server/build.gradle.kts
+++ b/examples/server/build.gradle.kts
@@ -3,6 +3,11 @@ plugins {
     kotlin("jvm")
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
 dependencies {
     implementation(project(":stub"))
     runtimeOnly("io.grpc:grpc-netty:${rootProject.ext["grpcVersion"]}")
diff --git a/examples/stub-android/build.gradle.kts b/examples/stub-android/build.gradle.kts
index 96046b87..b93e9def 100644
--- a/examples/stub-android/build.gradle.kts
+++ b/examples/stub-android/build.gradle.kts
@@ -22,19 +22,19 @@ dependencies {
 }
 
 android {
-    compileSdkVersion(30)
-    buildToolsVersion = "30.0.3"
+    compileSdkVersion(31)
+    buildToolsVersion = "31.0.0"
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
     kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
         freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn")
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
 }
 
diff --git a/examples/stub-lite/build.gradle.kts b/examples/stub-lite/build.gradle.kts
index 05a79faa..c6fc6e76 100644
--- a/examples/stub-lite/build.gradle.kts
+++ b/examples/stub-lite/build.gradle.kts
@@ -21,6 +21,7 @@ dependencies {
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
diff --git a/examples/stub/build.gradle.kts b/examples/stub/build.gradle.kts
index 714279da..1abd5f93 100644
--- a/examples/stub/build.gradle.kts
+++ b/examples/stub/build.gradle.kts
@@ -23,6 +23,7 @@ dependencies {
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {

From c468ec3dce0d9b2aca28723ac3549bd896a8b1a8 Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Mon, 20 Dec 2021 13:21:32 -0700
Subject: [PATCH 8/9] examples only on jdk 1.11

---
 .github/workflows/gradle.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index dfbefc38..53aade8f 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -25,5 +25,6 @@ jobs:
       run: ./gradlew publishToMavenLocal
 
     - name: Build Examples
+      if: matrix.java == '1.11'
       run: ./gradlew build
       working-directory: ./examples

From d330d33ea5476c97952d4880ad65eefda2d33dbc Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Mon, 20 Dec 2021 13:23:50 -0700
Subject: [PATCH 9/9] try new setup-java

---
 .github/workflows/gradle.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 53aade8f..84462917 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -9,14 +9,16 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        java: [1.8, 1.11]
+        java: ['8', '11']
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
 
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
+        distribution: 'temurin'
         java-version: ${{ matrix.java }}
+        cache: 'gradle'
 
     - name: Build Library
       run: ./gradlew build
@@ -25,6 +27,6 @@ jobs:
       run: ./gradlew publishToMavenLocal
 
     - name: Build Examples
-      if: matrix.java == '1.11'
+      if: matrix.java == '11'
       run: ./gradlew build
       working-directory: ./examples