[SVN] r3342 Inventory in /Libraries/twister-lib-android/

[MOD] Use public Gradle plugins (0.11 -> 0.13 and 4.1.1.... -> 0.13 + AGP 4.1.1)
TWiStErRob · Feb 22, 2023 · b6cd08e · b6cd08e
1 parent ab7f25d
commit b6cd08e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/libs/twister-lib-android/build.gradle b/libs/twister-lib-android/build.gradle
@@ -8,8 +8,9 @@ buildscript {
 	}
 	dependencies {
 		configurations["classpath"].resolutionStrategy.cacheChangingModulesFor(0, "seconds") // -SNAPSHOT
-		classpath "net.twisterrob.gradle:plugin:${VERSION_TWISTER_GRADLE}"
+		classpath "net.twisterrob.gradle:twister-convention-plugins:${VERSION_TWISTER_GRADLE}"
 		classpath "net.twisterrob.gradle:twister-quality:${VERSION_TWISTER_QUALITY}"
+		classpath("com.android.tools.build:gradle:4.1.1")
 	}
 }
 

diff --git a/libs/twister-lib-android/gradle.properties b/libs/twister-lib-android/gradle.properties
@@ -7,8 +7,8 @@ org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
 android.enableJetifier=true
 
-VERSION_TWISTER_GRADLE=4.1.1.14-29-29.1
-VERSION_TWISTER_QUALITY=0.11
+VERSION_TWISTER_GRADLE=0.13
+VERSION_TWISTER_QUALITY=0.13
 
 # === Production ===
 

diff --git a/libs/twister-lib-java/build.gradle b/libs/twister-lib-java/build.gradle
@@ -7,7 +7,8 @@ buildscript {
 	}
 	dependencies {
 		configurations["classpath"].resolutionStrategy.cacheChangingModulesFor(0, "seconds") // -SNAPSHOT
-		classpath "net.twisterrob.gradle:plugin:${VERSION_TWISTER_GRADLE}"
+		classpath "net.twisterrob.gradle:twister-convention-plugins:${VERSION_TWISTER_GRADLE}"
+		classpath("com.android.tools.build:gradle:4.1.1")
 	}
 }
 

diff --git a/libs/twister-lib-java/gradle.properties b/libs/twister-lib-java/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.configureondemand=false
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx2048M
 
-VERSION_TWISTER_GRADLE=4.1.1.14-29-29.1
+VERSION_TWISTER_GRADLE=0.13
 
 # === Production ===
 VERSION_SLF4J=1.7.30