Commit f0f18181 authored by Mygod's avatar Mygod

Update to Android R DP2

parent c7e6a578
...@@ -24,10 +24,10 @@ val Project.currentFlavor get() = gradle.startParameter.taskRequests.toString(). ...@@ -24,10 +24,10 @@ val Project.currentFlavor get() = gradle.startParameter.taskRequests.toString().
fun Project.setupCommon() { fun Project.setupCommon() {
android.apply { android.apply {
compileSdkVersion(29) compileSdkVersion("android-R")
defaultConfig { defaultConfig {
minSdkVersion(21) minSdkVersion(21)
targetSdkVersion(29) targetSdkVersion("R")
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }
val javaVersion = JavaVersion.VERSION_1_8 val javaVersion = JavaVersion.VERSION_1_8
......
...@@ -93,7 +93,7 @@ object DefaultNetworkListener { ...@@ -93,7 +93,7 @@ object DefaultNetworkListener {
// NB: this runs in ConnectivityThread, and this behavior cannot be changed until API 26 // NB: this runs in ConnectivityThread, and this behavior cannot be changed until API 26
private object Callback : ConnectivityManager.NetworkCallback() { private object Callback : ConnectivityManager.NetworkCallback() {
override fun onAvailable(network: Network) = runBlocking { networkActor.send(NetworkMessage.Put(network)) } override fun onAvailable(network: Network) = runBlocking { networkActor.send(NetworkMessage.Put(network)) }
override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities?) { override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
// it's a good idea to refresh capabilities // it's a good idea to refresh capabilities
runBlocking { networkActor.send(NetworkMessage.Update(network)) } runBlocking { networkActor.send(NetworkMessage.Update(network)) }
} }
......
...@@ -120,7 +120,7 @@ class ScannerActivity : AppCompatActivity(), BarcodeRetriever { ...@@ -120,7 +120,7 @@ class ScannerActivity : AppCompatActivity(), BarcodeRetriever {
menuInflater.inflate(R.menu.scanner_menu, menu) menuInflater.inflate(R.menu.scanner_menu, menu)
return true return true
} }
override fun onOptionsItemSelected(item: MenuItem?) = when (item?.itemId) { override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
R.id.action_import_clipboard -> { R.id.action_import_clipboard -> {
startImport(true) startImport(true)
true true
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment