From 1f355877395ffa1e9d54615fdc52a13772a08bbd Mon Sep 17 00:00:00 2001 From: kai-morich Date: Tue, 19 Apr 2022 20:52:38 +0200 Subject: [PATCH] target-sdk + dependency update --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- usbSerialExamples/build.gradle | 9 ++++----- usbSerialExamples/src/main/AndroidManifest.xml | 3 ++- usbSerialForAndroid/build.gradle | 7 +++---- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 301167f..cddb2c1 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' + classpath 'com.android.tools.build:gradle:7.1.3' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ff912a2..b842c72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip diff --git a/usbSerialExamples/build.gradle b/usbSerialExamples/build.gradle index 1af7139..9b27189 100644 --- a/usbSerialExamples/build.gradle +++ b/usbSerialExamples/build.gradle @@ -3,8 +3,7 @@ plugins { } android { - compileSdkVersion 30 - buildToolsVersion '30.0.3' + compileSdkVersion 31 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -13,7 +12,7 @@ android { defaultConfig { minSdkVersion 17 - targetSdkVersion 30 + targetSdkVersion 31 vectorDrawables.useSupportLibrary = true testInstrumentationRunner "android.test.InstrumentationTestRunner" @@ -29,6 +28,6 @@ android { dependencies { implementation project(':usbSerialForAndroid') - implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'com.google.android.material:material:1.4.0' + implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'com.google.android.material:material:1.5.0' } diff --git a/usbSerialExamples/src/main/AndroidManifest.xml b/usbSerialExamples/src/main/AndroidManifest.xml index d264658..e0cf879 100644 --- a/usbSerialExamples/src/main/AndroidManifest.xml +++ b/usbSerialExamples/src/main/AndroidManifest.xml @@ -17,7 +17,8 @@ android:name=".MainActivity" android:label="@string/app_name" android:launchMode="singleTask" - android:windowSoftInputMode="stateHidden|adjustResize"> + android:windowSoftInputMode="stateHidden|adjustResize" + android:exported="true"> diff --git a/usbSerialForAndroid/build.gradle b/usbSerialForAndroid/build.gradle index 1779c81..98962d5 100644 --- a/usbSerialForAndroid/build.gradle +++ b/usbSerialForAndroid/build.gradle @@ -4,12 +4,11 @@ plugins { } android { - compileSdkVersion 30 - buildToolsVersion '30.0.3' + compileSdkVersion 31 defaultConfig { minSdkVersion 17 - targetSdkVersion 30 + targetSdkVersion 31 consumerProguardFiles 'proguard-rules.pro' testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -25,7 +24,7 @@ android { } dependencies { - implementation "androidx.annotation:annotation:1.2.0" + implementation "androidx.annotation:annotation:1.3.0" testImplementation 'junit:junit:4.13.2' testImplementation 'org.mockito:mockito-core:1.10.19' androidTestImplementation 'com.android.support.test:runner:1.0.2'