Merge branch 'release_0.19.0'

Author: runningcode

docs/releasing.md

@@ -36,18 +36,19 @@ git tag v{{ fladle.next_release }}
 git push origin v{{ fladle.next_release }}
 ```
 
-* Upload to Maven Central
+* Upload to Maven Central (this must run in two separate commands since they are from two different namespaces)
 ``` bash
-./gradlew :fladle-plugin:publishAllPublicationsToMavenRepository -Pfladle.releaseMode -Dorg.gradle.internal.publish.checksums.insecure=true
+./gradlew :fladle-plugin:publishFladlePluginMarkerMavenPublicationToMavenCentralRepository publishFulladlePluginMarkerMavenPublicationToMavenCentralRepository -Pfladle.release 
+./gradlew :fladle-plugin:publishPluginMavenPublicationToMavenCentralRepository -Pfladle.release
 ```
 * Upload to Gradle Plugin Portal
 ```bash
 ./gradlew :fladle-plugin:publishPlugins -Pfladle.releaseMode -Dorg.gradle.internal.publish.checksums.insecure=true
 ```
 
 * Release to Maven Central
-    * Login to Sonatype OSS Nexus: [https://oss.sonatype.org/](https://oss.sonatype.org/)
-    * Click on **Staging Repositories**
+    * Login to Maven Central Repository: [https://central.sonatype.com/](https://oss.sonatype.com/)
+    * Click on **Publish**
 
 * Merge the release branch to master
 ```

fladle-plugin/build.gradle.kts

@@ -1,7 +1,7 @@
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 group = "com.osacky.flank.gradle"
-version = "0.18.1-SNAPSHOT"
+version = "0.19.0"
 description = "Easily Scale your Android Instrumentation Tests with Firebase Test Lab with Flank"
 
 repositories {
@@ -15,8 +15,7 @@ plugins {
   `java-gradle-plugin`
   alias(libs.plugins.gradle.plugin.publish)
   alias(libs.plugins.kotlinter)
-  `maven-publish`
-  signing
+  alias(libs.plugins.vanniktech.publish)
 }
 
 // See https://github.com/slackhq/keeper/pull/11#issuecomment-579544375 for context
@@ -57,66 +56,37 @@ gradlePlugin {
   }
 }
 
-val isReleaseBuild : Boolean = !version.toString().endsWith("SNAPSHOT")
+java {
+  withJavadocJar()
+  withSourcesJar()
+}
 
-val sonatypeUsername : String? by project
-val sonatypePassword : String? by project
+mavenPublishing {
+  publishToMavenCentral()
+  signAllPublications()
 
-publishing {
-  repositories {
-    repositories {
-      maven {
-        val releasesRepoUrl = uri("https://central.sonatype.com/api/v1/publisher/deployments/upload/")
-        val snapshotsRepoUrl = uri("https://central.sonatype.com/repository/maven-snapshots/")
-        url = if (isReleaseBuild) releasesRepoUrl else snapshotsRepoUrl
-        credentials {
-          username = sonatypeUsername
-          password = sonatypePassword
-        }
+  pom {
+    name.set("Fladle")
+    description.set(project.description)
+    url.set("https://github.com/runningcode/fladle")
+    licenses {
+      license {
+        name.set("The Apache License, Version 2.0")
+        url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
       }
     }
-  }
-  publications {
-    afterEvaluate {
-      named<MavenPublication>("fladlePluginMarkerMaven") {
-        pom.configureForFladle("Fladle")
+    developers {
+      developer {
+        id.set("runningcode")
+        name.set("Nelson Osacky")
       }
-
-      named<MavenPublication>("pluginMaven") {
-        pom.configureForFladle("Fladle")
-      }
-      named<MavenPublication>("fulladlePluginMarkerMaven") {
-        pom.configureForFladle("Fulladle")
-      }
-    }
-  }
-}
-
-signing {
-  isRequired = isReleaseBuild
-}
-
-fun org.gradle.api.publish.maven.MavenPom.configureForFladle(pluginName: String) {
-  name.set(pluginName)
-  description.set(project.description)
-  url.set("https://github.com/runningcode/fladle")
-  licenses {
-    license {
-      name.set("The Apache License, Version 2.0")
-      url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
     }
-  }
-  developers {
-    developer {
-      id.set("runningcode")
-      name.set("Nelson Osacky")
+    scm {
+      connection.set("scm:git:git://github.com/runningcode/fladle.git")
+      developerConnection.set("scm:git:ssh://github.com/runningcode/fladle.git")
+      url.set("https://github.com/runningcode/fladle")
     }
   }
-  scm {
-    connection.set("scm:git:git://github.com/runningcode/fladle.git")
-    developerConnection.set("scm:git:ssh://github.com/runningcode/fladle.git")
-    url.set("https://github.com/runningcode/fladle")
-  }
 }
 
 tasks.withType(Test::class.java).configureEach {
@@ -134,10 +104,10 @@ tasks.withType(ValidatePlugins::class.java).configureEach {
 
 // Ensure Java 11 Compatibility. See https://github.com/runningcode/fladle/issues/246
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java).configureEach {
-  kotlinOptions {
-    jvmTarget = "11"
-    languageVersion = "1.7"
-    apiVersion = "1.7"
+  compilerOptions {
+    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
+    languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_7)
+    apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_7)
   }
 }
 

gradle/libs.versions.toml

@@ -8,6 +8,8 @@ kotlinter = { id = "org.jmailen.kotlinter", version = "4.0.0" }
 
 gradle-plugin-publish = {id = "com.gradle.plugin-publish", version = "1.3.1" }
 
+vanniktech-publish = { id = "com.vanniktech.maven.publish", version = "0.34.0" }
+
 kgp = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin"}
 agp = { id = "com.android.application", version.ref = "agp-version"}
 

mkdocs.yml

@@ -4,8 +4,8 @@
 
 extra:
   fladle:
-    current_release: '0.18.0'
-    next_release: '0.18.1'
+    current_release: '0.19.0'
+    next_release: '0.19.1'
     flank_version: '23.10.1'
 
 site_name: Fladle