Update Gradle plugin publish (#352)

* Update Gradle plugin publish

Update included flank version

* Fix failing tests

Author: runningcode

docs/changelog.md

@@ -1,7 +1,9 @@
 # Changelog
 
 ## Unreleased
-
+* Min supported Gradle version is now 6.5
+* Updated Flank version to 23.10.0
+*
 ## 0.17.4
 * Add support for additionalTestApks in YamlConfigWriterTask. [PR](https://github.com/runningcode/fladle/pull/291). Thanks [ZacSweers](https://github.com/ZacSweers)
 * Add `abi` option to support selecting a particular debug APK in projects that use [ABI splits](https://developer.android.com/studio/build/configure-apk-splits#configure-abi-split) to produce multiple APKs. [PR](https://github.com/runningcode/fladle/pull/281)
@@ -56,7 +58,7 @@
 
 ## 0.13.1
 * Fix flankAuth task throwing exception. [Fixes #195](https://github.com/runningcode/fladle/issues/195)
-* Add support for newly added flank options [PR#186](https://github.com/runningcode/fladle/pull/186) Thanks [pawelpasterz](https://github.com/pawelpasterz): 
+* Add support for newly added flank options [PR#186](https://github.com/runningcode/fladle/pull/186) Thanks [pawelpasterz](https://github.com/pawelpasterz):
     * `default-test-time`
     * `default-class-test-time`
     * `additional-apks`

fladle-plugin/build.gradle.kts

@@ -40,30 +40,23 @@ kotlinter {
   indentSize = 2
 }
 
-pluginBundle {
-  website = "https://github.com/runningcode/fladle"
-  vcsUrl = "https://github.com/runningcode/fladle"
-  tags = listOf("flank", "testing", "android", "fladle")
-
-  mavenCoordinates {
-    artifactId = "fladle"
-    groupId = project.group.toString()
-  }
-}
-
 gradlePlugin {
+  website.set("https://github.com/runningcode/fladle")
+  vcsUrl.set("https://github.com/runningcode/fladle")
   plugins {
     create("fladle") {
       id = "com.osacky.fladle"
       displayName = "Fladle"
       description = project.description
       implementationClass = "com.osacky.flank.gradle.FlankGradlePlugin"
+      tags.set(listOf("flank", "testing", "android", "fladle"))
     }
     create("fulladle") {
       id = "com.osacky.fulladle"
       displayName = "Fulladle"
       description = project.description
       implementationClass = "com.osacky.flank.gradle.FulladlePlugin"
+      tags.set(listOf("flank", "testing", "android", "fladle"))
     }
   }
 }
@@ -100,18 +93,15 @@ publishing {
   publications {
     afterEvaluate {
       named<MavenPublication>("fladlePluginMarkerMaven") {
-        signing.sign(this)
         pom.configureForFladle("Fladle")
       }
 
       named<MavenPublication>("pluginMaven") {
         artifact(tasks["sourcesJar"])
         artifact(tasks["javadocJar"])
-        signing.sign(this)
         pom.configureForFladle("Fladle")
       }
       named<MavenPublication>("fulladlePluginMarkerMaven") {
-        signing.sign(this)
         pom.configureForFladle("Fulladle")
       }
     }

fladle-plugin/src/main/java/com/osacky/flank/gradle/FlankGradleExtension.kt

@@ -17,7 +17,7 @@ import javax.inject.Inject
 open class FlankGradleExtension @Inject constructor(objects: ObjectFactory) : FladleConfig {
 
   companion object {
-    const val FLANK_VERSION = "23.04.0"
+    const val FLANK_VERSION = "23.10.0"
   }
 
   @get:Input

fladle-plugin/src/main/java/com/osacky/flank/gradle/FlankJavaExec.kt

@@ -2,19 +2,14 @@ package com.osacky.flank.gradle
 
 import org.gradle.api.file.ProjectLayout
 import org.gradle.api.tasks.JavaExec
-import org.gradle.util.GradleVersion
 import org.gradle.work.DisableCachingByDefault
 import javax.inject.Inject
 
 @DisableCachingByDefault(because = "Flank executions are dependent on resources such as network connection and server and therefore cannot be cached.")
 open class FlankJavaExec @Inject constructor(projectLayout: ProjectLayout) : JavaExec() {
   init {
     group = FladlePluginDelegate.TASK_GROUP
-    if (GradleVersion.current() >= GradleVersion.version("6.4")) {
-      mainClass.set("ftl.Main")
-    } else {
-      main = "ftl.Main"
-    }
+    mainClass.set("ftl.Main")
     workingDir(projectLayout.fladleDir)
   }
 

fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/FlankGradlePluginIntegrationTest.kt

@@ -12,7 +12,7 @@ class FlankGradlePluginIntegrationTest {
   @get:Rule
   var testProjectRoot = TemporaryFolder()
 
-  val minSupportGradleVersion = "5.5"
+  val minSupportGradleVersion = "6.5"
   val oldVersion = "5.3.1"
 
   fun writeBuildGradle(build: String) {

gradle/libs.versions.toml

@@ -6,7 +6,7 @@ ben-manes-versions = { id = "com.github.ben-manes.versions", version = "0.49.0"
 
 kotlinter = { id = "org.jmailen.kotlinter", version = "3.9.0" }
 
-gradle-plugin-publish = {id = "com.gradle.plugin-publish", version = "0.20.0" }
+gradle-plugin-publish = {id = "com.gradle.plugin-publish", version = "1.2.1" }
 
 kgp = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin"}
 agp = { id = "com.android.application", version.ref = "agp-version"}
@@ -29,7 +29,7 @@ junit-version = "4.13.2"
 
 kotlin = "1.8.10"
 agp-version = "4.2.2"
-flank-version = "23.04.0"
+flank-version = "23.10.0"
 
 [libraries]
 

mkdocs.yml

@@ -6,7 +6,7 @@ extra:
   fladle:
     current_release: '0.17.4'
     next_release: '0.17.5'
-    flank_version: '23.04.0'
+    flank_version: '23.10.0'
 
 site_name: Fladle
 site_url: https://runningcode.github.io/fladle/

sample-flavors-kotlin/build.gradle.kts

@@ -35,7 +35,7 @@ androidComponents {
 }
 
 fladle {
-    flankVersion.set("23.04.0")
+    flankVersion.set("23.10.0")
     variant.set("chocolateDebug")
     debugApk.set(project.provider { "${buildDir.toString()}/outputs/apk/chocolate/debug/*.apk" })
     serviceAccountCredentials.set(project.layout.projectDirectory.file("flank-gradle-5cf02dc90531.json"))

sample-kotlin/build.gradle.kts

@@ -18,7 +18,7 @@ android {
 }
 
 fladle {
-    flankVersion.set("23.04.0")
+    flankVersion.set("23.10.0")
     // Project Id is not needed if serviceAccountCredentials are set.
     projectId.set("flank-gradle")
     useOrchestrator.set(true)