Skip to content

Commit b6cd08e

Browse files
committedFeb 22, 2023
[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)
1 parent ab7f25d commit b6cd08e

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed
 

‎libs/twister-lib-android/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ buildscript {
88
}
99
dependencies {
1010
configurations["classpath"].resolutionStrategy.cacheChangingModulesFor(0, "seconds") // -SNAPSHOT
11-
classpath "net.twisterrob.gradle:plugin:${VERSION_TWISTER_GRADLE}"
11+
classpath "net.twisterrob.gradle:twister-convention-plugins:${VERSION_TWISTER_GRADLE}"
1212
classpath "net.twisterrob.gradle:twister-quality:${VERSION_TWISTER_QUALITY}"
13+
classpath("com.android.tools.build:gradle:4.1.1")
1314
}
1415
}
1516

‎libs/twister-lib-android/gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ org.gradle.jvmargs=-Xmx2048M
77
android.useAndroidX=true
88
android.enableJetifier=true
99

10-
VERSION_TWISTER_GRADLE=4.1.1.14-29-29.1
11-
VERSION_TWISTER_QUALITY=0.11
10+
VERSION_TWISTER_GRADLE=0.13
11+
VERSION_TWISTER_QUALITY=0.13
1212

1313
# === Production ===
1414

‎libs/twister-lib-java/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ buildscript {
77
}
88
dependencies {
99
configurations["classpath"].resolutionStrategy.cacheChangingModulesFor(0, "seconds") // -SNAPSHOT
10-
classpath "net.twisterrob.gradle:plugin:${VERSION_TWISTER_GRADLE}"
10+
classpath "net.twisterrob.gradle:twister-convention-plugins:${VERSION_TWISTER_GRADLE}"
11+
classpath("com.android.tools.build:gradle:4.1.1")
1112
}
1213
}
1314

‎libs/twister-lib-java/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ org.gradle.configureondemand=false
44
org.gradle.parallel=true
55
org.gradle.jvmargs=-Xmx2048M
66

7-
VERSION_TWISTER_GRADLE=4.1.1.14-29-29.1
7+
VERSION_TWISTER_GRADLE=0.13
88

99
# === Production ===
1010
VERSION_SLF4J=1.7.30

0 commit comments

Comments
 (0)
Please sign in to comment.