pull sdk updated deps from maven

codeanticode · codeanticode · commit da522a477e2d · 2021-01-01T20:01:09.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -72,28 +72,15 @@ allprojects {
     localProperties.load(project.rootProject.file("local.properties").newDataInputStream())
     def sdkDir = localProperties.getProperty("sdk.dir")
     ext.androidPlatformPath = "${sdkDir}/platforms/android-${targetSdkVersion}"
-    ext.androidToolsLibPath = "${sdkDir}/tools/lib"
-
     ext.coreZipPath = "${rootDir}/mode/processing-core.zip"
 
     repositories {
         google()
         jcenter()
-
         maven { url "https://maven.google.com" }
         maven { url "https://jitpack.io" }
-
         maven { url 'https://repo.gradle.org/gradle/libs-releases' }
-
-        // maven {
-        //     // mavenCentral() does not work to download the Gradle releases of gradle-tooling-api, one needs
-        //     // to set the artifact url as below to get the latest packages.
-        //     // https://mvnrepository.com/artifact/org.gradle/gradle-tooling-api?repo=gradle-libs-releases-local
-        //     url "https://repo1.maven.org/maven2"
-        //     artifactUrls "https://repo.gradle.org/gradle/libs-releases-local"
-        // }
         flatDir dirs: androidPlatformPath
-        flatDir dirs: androidToolsLibPath
         flatDir dirs: "${rootDir}/core/dist"
     }
 
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -8,5 +8,5 @@ repositories {
 dependencies {	
     implementation gradleApi()
     implementation localGroovy()
-    implementation 'com.android.tools.build:gradle:3.5.1'
+    implementation 'com.android.tools.build:gradle:4.1.1'
 }
diff --git a/mode/.classpath b/mode/.classpath
@@ -6,7 +6,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/processing-java"/>
 	<classpathentry kind="lib" path="mode/jdi.jar"/>
-	<classpathentry kind="lib" path="mode/gradle-tooling-api-5.6.2.jar"/>
+	<classpathentry kind="lib" path="mode/gradle-tooling-api-6.7.1.jar"/>
 	<classpathentry kind="lib" path="mode/jdimodel.jar"/>
 	<classpathentry kind="output" path="core/bin"/>
 </classpath>
diff --git a/mode/tools/SDKUpdater/.classpath b/mode/tools/SDKUpdater/.classpath
@@ -3,8 +3,8 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/android-mode"/>
-	<classpathentry kind="var" path="ANDROID_SDK/tools/lib/sdklib-26.0.0-dev.jar"/>
-	<classpathentry kind="var" path="ANDROID_SDK/tools/lib/repository-26.0.0-dev.jar"/>
+	<classpathentry kind="lib" path="lib/sdklib-27.1.1.jar"/>
+	<classpathentry kind="lib" path="lib/repository-27.1.1.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/processing-app"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/mode/tools/SDKUpdater/build.gradle b/mode/tools/SDKUpdater/build.gradle
@@ -1,12 +1,26 @@
 import java.nio.file.Files
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 
+configurations {
+    compile.extendsFrom compileAndCopy
+}
+
 dependencies {
     compile group: "org.processing", name: "pde", version: "${processingVersion}"
 
-    compile name: "sdklib-${toolsLibVersion}"
-    compile name: "repository-${toolsLibVersion}"
+    compileAndCopy group: "com.android.tools", name: "sdklib", version: "${toolsLibVersion}"
+    compileAndCopy group: "com.android.tools", name: "repository", version: "${toolsLibVersion}"
+}
+
+// This task copies the gradle tooling jar into the mode folder
+task copyToLib(type: Copy) {
+  from configurations.compileAndCopy.files {
+    include '**/sdklib*'
+    include '**/repository*'
+  }
+  into "lib"
 }
+build.dependsOn(copyToLib)
 
 sourceSets {
     main {
@@ -18,6 +32,7 @@ sourceSets {
 
 clean.doFirst {
     delete "tool"
+    delete "lib"
 }
 
 build.doLast {
diff --git a/mode/tools/SDKUpdater/src/processing/mode/android/tools/SDKUpdater.java b/mode/tools/SDKUpdater/src/processing/mode/android/tools/SDKUpdater.java
@@ -165,6 +165,17 @@ public void setForceHttp(boolean b) { }
         public Channel getChannel() {
           return null;
         }
+
+        @Override
+        public boolean getDisableSdkPatches() {
+          return false;
+        }
+
+        @Override
+        public void setDisableSdkPatches(boolean arg0) {
+          // TODO Auto-generated method stub
+          
+        }
       }), null);
 
       RepositoryPackages packages = mRepoManager.getPackages();      
@@ -340,6 +351,17 @@ public java.util.List<String> getPaths(RepoManager mgr) {
         }
         return updates;
       }
+
+      @Override
+      public boolean getDisableSdkPatches() {
+        return false;
+      }
+
+      @Override
+      public void setDisableSdkPatches(boolean arg0) {
+        // TODO Auto-generated method stub
+        
+      }
     }
   }
 
diff --git a/mode/version.properties b/mode/version.properties
@@ -1,6 +1,6 @@
 # Basics
-android-platform = 28
-android-toolslib = 26.0.0-dev
+android-platform = 29
+android-toolslib = 27.1.1
 gradlew = 6.7.1
 
 # Minimum SDK versions for each type of project

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@ repositories {`
`8`	`8`	`dependencies {`
`9`	`9`	`implementation gradleApi()`
`10`	`10`	`implementation localGroovy()`
`11`		`- implementation 'com.android.tools.build:gradle:3.5.1'`
	`11`	`+ implementation 'com.android.tools.build:gradle:4.1.1'`
`12`	`12`	`}`