diff --git a/README.md b/README.md index f12fa0e1986..5c4b7b6de90 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ gRPC-Java - An RPC library and framework Supported Platforms ------------------- -gRPC-Java supports Java 8 and later. Android minSdkVersion 23 (Marshmallow) and +gRPC-Java supports Java 8 and later. Android minSdkVersion 24 (Nougat) and later are supported with [Java 8 language desugaring][android-java-8]. TLS usage on Android typically requires Play Services Dynamic Security Provider. diff --git a/android/build.gradle b/android/build.gradle index e94bf03ff37..344cbf76248 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -14,7 +14,7 @@ android { } compileSdkVersion 34 defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java b/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java index 3a750e02795..627952a34eb 100644 --- a/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java +++ b/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java @@ -16,14 +16,12 @@ package io.grpc.android; -import android.annotation.TargetApi; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.ConnectivityManager; import android.net.Network; -import android.os.Build; import android.util.Log; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; @@ -212,7 +210,7 @@ static final class AndroidChannel extends ManagedChannel { private void configureNetworkMonitoring() { // Android N added the registerDefaultNetworkCallback API to listen to changes in the device's // default network. For earlier Android API levels, use the BroadcastReceiver API. - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && connectivityManager != null) { + if (connectivityManager != null) { final DefaultNetworkCallback defaultNetworkCallback = new DefaultNetworkCallback(); connectivityManager.registerDefaultNetworkCallback(defaultNetworkCallback); unregisterRunnable = @@ -306,7 +304,6 @@ public void enterIdle() { } /** Respond to changes in the default network. Only used on API levels 24+. */ - @TargetApi(Build.VERSION_CODES.N) private class DefaultNetworkCallback extends ConnectivityManager.NetworkCallback { @Override public void onAvailable(Network network) { diff --git a/binder/build.gradle b/binder/build.gradle index 7e7d4810e98..605a3974304 100644 --- a/binder/build.gradle +++ b/binder/build.gradle @@ -13,7 +13,7 @@ android { targetCompatibility 1.8 } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/cronet/build.gradle b/cronet/build.gradle index e096761ddd2..2869b2f6993 100644 --- a/cronet/build.gradle +++ b/cronet/build.gradle @@ -14,7 +14,7 @@ android { namespace = 'io.grpc.cronet' compileSdkVersion 33 defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index 693ecff0c0a..7a93ee3b93c 100644 --- a/examples/android/helloworld/app/build.gradle +++ b/examples/android/helloworld/app/build.gradle @@ -10,7 +10,7 @@ android { defaultConfig { applicationId "io.grpc.helloworldexample" - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle index 06e55de9c94..10bce508368 100644 --- a/examples/android/routeguide/app/build.gradle +++ b/examples/android/routeguide/app/build.gradle @@ -10,7 +10,7 @@ android { defaultConfig { applicationId "io.grpc.routeguideexample" - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 33 versionCode 1 versionName "1.0"