Updates for new Gradle 4.10.

iiordanov · Jan 27, 2019 · abe40b5 · abe40b5
1 parent 2982afa
commit abe40b5
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 32 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/Opaque/AndroidManifest.xml b/Opaque/AndroidManifest.xml
@@ -5,8 +5,6 @@
     android:versionCode="1461"
     android:versionName="1.4.6" >
 
-    <uses-sdk android:minSdkVersion="14"/>
-
     <uses-permission android:name="android.permission.INTERNET"></uses-permission>
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"></uses-permission>

diff --git a/Opaque/build.gradle b/Opaque/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -20,10 +20,10 @@ allprojects {
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "27.0.3"
 
     defaultConfig {
         targetSdkVersion 27
+        minSdkVersion 14
     }
     useLibrary 'org.apache.http.legacy'
 
@@ -48,8 +48,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:26.1.0'
-    //compile 'org.apache.httpcomponents:httpclient:4.5.5'
-    compile 'org.apache.httpcomponents:httpcore:4.4.9'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'org.apache.httpcomponents:httpcore:4.4.9'
 }
 
diff --git a/Opaque/gradle/wrapper/gradle-wrapper.properties b/Opaque/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Apr 07 10:32:47 EDT 2018
+#Sun Jan 27 17:01:43 EST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/bVNC/AndroidManifest.xml.aRDP b/bVNC/AndroidManifest.xml.aRDP
@@ -4,7 +4,6 @@
           package="com.iiordanov.aRDP" android:installLocation="auto"
           android:versionCode="114035" android:versionName="v4.0.3">
 
-    <uses-sdk android:minSdkVersion="21"> </uses-sdk>
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>
     <uses-permission android:name="android.permission.VIBRATE"> </uses-permission>

diff --git a/bVNC/AndroidManifest.xml.aSPICE b/bVNC/AndroidManifest.xml.aSPICE
@@ -4,7 +4,6 @@
           package="com.iiordanov.aSPICE" android:installLocation="auto"
           android:versionCode="114035" android:versionName="v4.0.3">
 
-    <uses-sdk android:minSdkVersion="14"></uses-sdk>
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>
     <uses-permission android:name="android.permission.VIBRATE"> </uses-permission>

diff --git a/bVNC/AndroidManifest.xml.bVNC b/bVNC/AndroidManifest.xml.bVNC
@@ -4,9 +4,7 @@
           package="com.iiordanov.bVNC" android:installLocation="auto"
           android:versionCode="114035" android:versionName="v4.0.3">
 
-    <uses-sdk android:minSdkVersion="14"> </uses-sdk>
-    <uses-permission
-        tools:node="removeAll"/>
+    <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>
     <uses-permission android:name="android.permission.VIBRATE"> </uses-permission>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"> </uses-permission>

diff --git a/bVNC/AndroidManifest.xml.freeaRDP b/bVNC/AndroidManifest.xml.freeaRDP
@@ -4,7 +4,6 @@
           package="com.iiordanov.freeaRDP" android:installLocation="auto"
           android:versionCode="114035" android:versionName="v4.0.3">
 
-    <uses-sdk android:minSdkVersion="21"> </uses-sdk>
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>
     <uses-permission android:name="android.permission.VIBRATE"> </uses-permission>

diff --git a/bVNC/AndroidManifest.xml.freeaSPICE b/bVNC/AndroidManifest.xml.freeaSPICE
@@ -4,7 +4,6 @@
           package="com.iiordanov.freeaSPICE" android:installLocation="auto"
           android:versionCode="114035" android:versionName="v4.0.3">
 
-    <uses-sdk android:minSdkVersion="14"> </uses-sdk>
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>
     <uses-permission android:name="android.permission.VIBRATE"> </uses-permission>

diff --git a/bVNC/AndroidManifest.xml.freebVNC b/bVNC/AndroidManifest.xml.freebVNC
@@ -4,7 +4,6 @@
           package="com.iiordanov.freebVNC" android:installLocation="auto"
           android:versionCode="114035" android:versionName="v4.0.3">
 
-    <uses-sdk android:minSdkVersion="14"> </uses-sdk>
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>
     <uses-permission android:name="android.permission.VIBRATE"> </uses-permission>

diff --git a/bVNC/build.gradle b/bVNC/build.gradle
@@ -5,6 +5,7 @@ android {
 
     defaultConfig {
         targetSdkVersion 27
+        minSdkVersion project.getProperties().get("SDK_VERSION")
     }
 
     buildTypes {

diff --git a/bVNC/src2/main/res/layout-large/connection_list.xml b/bVNC/src2/main/res/layout-large/connection_list.xml
@@ -7,7 +7,7 @@
   android:orientation="vertical"
   >
 <ListView
-  android:id="@+android:id/android:list"
+  android:id="@+id/android:list"
   android:layout_width="match_parent"
   android:layout_height="match_parent"/>
 

diff --git a/bVNC/src2/main/res/layout/connection_list.xml b/bVNC/src2/main/res/layout/connection_list.xml
@@ -7,7 +7,7 @@
   android:orientation="vertical"
   >
 <ListView
-  android:id="@+android:id/android:list"
+  android:id="@+id/android:list"
   android:layout_width="match_parent"
   android:layout_height="match_parent"/>
 

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xmx2048M
+SDK_VERSION=14
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jan 18 02:49:26 EST 2019
+#Sun Jan 27 17:01:43 EST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip