AGP 8.6.1

Author: syslogic

build.gradle

@@ -18,22 +18,21 @@ plugins {
 }
 
 dependencies {
+    compileOnly gradleApi()
     //noinspection DependencyNotationArgument
-    implementation libs.gradle.api
+    implementation libs.android.gradle
     //noinspection DependencyNotationArgument
     implementation libs.annotations
     //noinspection DependencyNotationArgument
     implementation libs.bundles.http.components
-    //noinspection DependencyNotationArgument
-    implementation libs.gson
-    compileOnly gradleApi()
 
     testImplementation libs.junit
     //noinspection DependencyNotationArgument
     testImplementation libs.annotations
     testImplementation gradleTestKit()
     testImplementation(project)
 }
+
 gradlePlugin {
     plugins {
         PublishingPlugin {
@@ -45,7 +44,6 @@ gradlePlugin {
     }
 }
 
-
 tasks.withType(Jar).configureEach {
     archiveBaseName.set(plugin_identifier)
     archiveVersion.set("${plugin_version}")
@@ -55,8 +53,7 @@ tasks.withType(Test).configureEach {
     useJUnitPlatform()
 }
 
-//noinspection ConfigurationAvoidance
-task javadocs(type: Javadoc) {
+tasks.register('javadocs', Javadoc) {
     title = "${plugin_display_name} ${plugin_version} API"
     source = java.sourceSets.main.java.srcDirs
     destinationDir = project.file('/build/outputs/javadoc')
@@ -68,15 +65,14 @@ task javadocs(type: Javadoc) {
     failOnError false
 }
 
-//noinspection ConfigurationAvoidance
-task javadocJar(type: Jar, dependsOn: javadoc) {
+tasks.register('javadocJar', Jar) {
+    dependsOn javadoc
     dependsOn javadoc
     archiveClassifier.set('javadoc')
     from javadoc.destinationDir
 }
 
-//noinspection ConfigurationAvoidance
-task sourcesJar(type: Jar) {
+tasks.register('sourcesJar', Jar) {
     from java.sourceSets.main.java.srcDirs
     archiveClassifier.set('sources')
 }

gradle/libs.versions.toml

@@ -1,30 +1,30 @@
 [versions]
-gradle_api      = '8.6.0'
-gradle_publish  = '1.2.2'
-plugin_version  = '1.3.5'
-annotations     = '23.0.0'
-httpcore        = '4.4.16'
-httpclient      = '4.5.14'
-httpmime        = '4.5.14'
-junit           = '5.8.2'
-gson            = '2.10.1'
+android_gradle = '8.6.1'
+gradle_publish = '1.2.2'
+plugin_version = '1.3.5'
+annotations    = '23.0.0'
+httpcore       = '4.4.16'
+httpclient     = '4.5.14'
+httpmime       = '4.5.14'
+junit          = '5.8.2'
+gson           = '2.10.1'
 
 [plugins]
-maven_publish   = { id = "maven-publish" }
-gradle_plugin   = { id = "org.gradle.java-gradle-plugin" }
-gradle_publish  = { id = "com.gradle.plugin-publish", version.ref = "gradle_publish" }
+maven_publish  = { id = "maven-publish" }
+gradle_plugin  = { id = "org.gradle.java-gradle-plugin" }
+gradle_publish = { id = "com.gradle.plugin-publish", version.ref = "gradle_publish" }
 
 # The plugin can be defined in other projects alike this:
 # agconnect_publishing = { id = "io.syslogic.agconnect.publishing", version.ref = "plugin_version" }
 
 [libraries]
-gradle_api      = { module = "com.android.tools.build:gradle-api", version.ref = "gradle_api" }
-annotations     = { module = "org.jetbrains:annotations", version.ref = "annotations" }
-httpcore        = { module = "org.apache.httpcomponents:httpcore", version.ref = "httpcore" }
-httpclient      = { module = "org.apache.httpcomponents:httpclient", version.ref = "httpclient" }
-httpmime        = { module = "org.apache.httpcomponents:httpmime", version.ref = "httpmime" }
-junit           = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
-gson            = { module = "com.google.code.gson:gson", version.ref = "gson" }
+android_gradle = { module = "com.android.tools.build:gradle-api", version.ref = "android_gradle" }
+annotations    = { module = "org.jetbrains:annotations", version.ref = "annotations" }
+httpcore       = { module = "org.apache.httpcomponents:httpcore", version.ref = "httpcore" }
+httpclient     = { module = "org.apache.httpcomponents:httpclient", version.ref = "httpclient" }
+httpmime       = { module = "org.apache.httpcomponents:httpmime", version.ref = "httpmime" }
+junit          = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
+gson           = { module = "com.google.code.gson:gson", version.ref = "gson" }
 
 [bundles]
-http_components = ["httpcore", "httpclient", "httpmime"]
+http_components = ["httpcore", "httpclient", "httpmime", "gson"]