From e527afdf3550994a61dbf5b91fba61f4d5431294 Mon Sep 17 00:00:00 2001
From: Kai Morich <mail@kai-morich.de>
Date: Sun, 11 Nov 2018 09:29:09 +0100
Subject: [PATCH] compile+target sdk 28, gradle 4.6

---
 .idea/misc.xml                                         | 10 +++++++---
 build.gradle                                           |  2 +-
 gradle/wrapper/gradle-wrapper.properties               |  4 ++--
 usbSerialExamples/build.gradle                         |  6 +++---
 usbSerialExamples/src/main/AndroidManifest.xml         |  2 --
 .../android/usbserial/examples/DeviceListActivity.java |  0
 .../usbserial/examples/SerialConsoleActivity.java      |  0
 usbSerialForAndroid/build.gradle                       | 10 +++++-----
 usbSerialForAndroid/src/main/AndroidManifest.xml       |  1 -
 9 files changed, 18 insertions(+), 17 deletions(-)
 rename usbSerialExamples/src/main/java/{src => }/com/hoho/android/usbserial/examples/DeviceListActivity.java (100%)
 rename usbSerialExamples/src/main/java/{src => }/com/hoho/android/usbserial/examples/SerialConsoleActivity.java (100%)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index c0f68ed..e0d5b93 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,27 +5,31 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="5">
+        <list size="7">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
           <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="6">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/build.gradle b/build.gradle
index df159ef..f400f0c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index eb10a04..93a408c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 27 21:28:01 CEST 2018
+#Sun Nov 11 09:16:07 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/usbSerialExamples/build.gradle b/usbSerialExamples/build.gradle
index cde7b10..fbcfcfa 100644
--- a/usbSerialExamples/build.gradle
+++ b/usbSerialExamples/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 28
 
         testInstrumentationRunner "android.test.InstrumentationTestRunner"
     }
diff --git a/usbSerialExamples/src/main/AndroidManifest.xml b/usbSerialExamples/src/main/AndroidManifest.xml
index 26ca72c..efa205f 100644
--- a/usbSerialExamples/src/main/AndroidManifest.xml
+++ b/usbSerialExamples/src/main/AndroidManifest.xml
@@ -4,8 +4,6 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-sdk android:minSdkVersion="12" />
-
     <uses-feature android:name="android.hardware.usb.host" />
 
     <application
diff --git a/usbSerialExamples/src/main/java/src/com/hoho/android/usbserial/examples/DeviceListActivity.java b/usbSerialExamples/src/main/java/com/hoho/android/usbserial/examples/DeviceListActivity.java
similarity index 100%
rename from usbSerialExamples/src/main/java/src/com/hoho/android/usbserial/examples/DeviceListActivity.java
rename to usbSerialExamples/src/main/java/com/hoho/android/usbserial/examples/DeviceListActivity.java
diff --git a/usbSerialExamples/src/main/java/src/com/hoho/android/usbserial/examples/SerialConsoleActivity.java b/usbSerialExamples/src/main/java/com/hoho/android/usbserial/examples/SerialConsoleActivity.java
similarity index 100%
rename from usbSerialExamples/src/main/java/src/com/hoho/android/usbserial/examples/SerialConsoleActivity.java
rename to usbSerialExamples/src/main/java/com/hoho/android/usbserial/examples/SerialConsoleActivity.java
diff --git a/usbSerialForAndroid/build.gradle b/usbSerialForAndroid/build.gradle
index d335842..0e66b22 100644
--- a/usbSerialForAndroid/build.gradle
+++ b/usbSerialForAndroid/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'maven'
 apply plugin: 'signing'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 28
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
@@ -22,10 +22,10 @@ android {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support:support-annotations:27.1.1'
+    androidTestImplementation 'com.android.support:support-annotations:28.0.0'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'commons-net:commons-net:3.6'
-    androidTestImplementation 'org.apache.commons:commons-lang3:3.7'
+    androidTestImplementation 'org.apache.commons:commons-lang3:3.8.1'
 }
 
 group = "com.hoho.android"
diff --git a/usbSerialForAndroid/src/main/AndroidManifest.xml b/usbSerialForAndroid/src/main/AndroidManifest.xml
index 9355f7b..fc20156 100644
--- a/usbSerialForAndroid/src/main/AndroidManifest.xml
+++ b/usbSerialForAndroid/src/main/AndroidManifest.xml
@@ -3,5 +3,4 @@
       package="com.hoho.android.usbserial"
       android:versionCode="1"
       android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="12" />
 </manifest>