Prepare 1.13.0 release (#3060)

* Prepare 1.13.0 release

* Update self analysis to 1.13.0

* Revert #3006

* Publish 1.13.1 directly to maven central

* Restore bintray credentials for artifactory snapshot publishing

buildSrc/build.gradle.kts

@@ -14,7 +14,7 @@ repositories {
 
 object Plugins {
     const val KOTLIN = "1.4.0"
-    const val DETEKT = "1.12.0"
+    const val DETEKT = "1.13.1"
     const val GITHUB_RELEASE = "2.2.12"
     const val ARTIFACTORY = "4.15.1"
     const val SHADOW = "5.2.0"
@@ -22,6 +22,7 @@ object Plugins {
     const val SONAR = "2.8"
     const val DOKKA = "1.4.0"
     const val SEMVER4J = "3.1.0"
+    const val NEXUS = "0.22.0"
 }
 
 dependencies {
@@ -34,4 +35,5 @@ dependencies {
     implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:${Plugins.SONAR}")
     implementation("org.jetbrains.dokka:dokka-gradle-plugin:${Plugins.DOKKA}")
     implementation("com.vdurmont:semver4j:${Plugins.SEMVER4J}")
+    implementation("io.codearte.gradle.nexus:gradle-nexus-staging-plugin:${Plugins.NEXUS}")
 }

buildSrc/src/main/kotlin/Versions.kt

@@ -1,6 +1,6 @@
 object Versions {
 
-    const val DETEKT: String = "1.12.0"
+    const val DETEKT: String = "1.13.1"
     const val JVM_TARGET: String = "1.8"
     const val JACOCO: String = "0.8.5"
 

buildSrc/src/main/kotlin/packaging.gradle.kts

@@ -8,6 +8,29 @@ plugins {
     `maven-publish` apply false
     signing apply false
     id("com.jfrog.artifactory") apply false
+    id("io.codearte.nexus-staging")
+}
+
+val sonatypeUsername: String? = findProperty("sonatypeUsername")
+    ?.toString()
+    ?: System.getenv("MAVEN_CENTRAL_USER")
+val sonatypePassword: String? = findProperty("sonatypePassword")
+    ?.toString()
+    ?: System.getenv("MAVEN_CENTRAL_PW")
+
+// still needed for artifactory snapshot publishing
+val bintrayUser: String? = findProperty("bintrayUser")
+    ?.toString()
+    ?: System.getenv("BINTRAY_USER")
+val bintrayKey: String? = findProperty("bintrayKey")
+    ?.toString()
+    ?: System.getenv("BINTRAY_API_KEY")
+
+nexusStaging {
+    packageGroup = "io.gitlab.arturbosch"
+    stagingProfileId = "1d8efc8232c5c"
+    username = sonatypeUsername
+    password = sonatypePassword
 }
 
 project(":detekt-cli") {
@@ -16,7 +39,7 @@ project(":detekt-cli") {
         plugin("com.github.johnrengelman.shadow")
     }
 
-    tasks.withType<ShadowJar>() {
+    tasks.withType<ShadowJar>().configureEach {
         mergeServiceFiles()
     }
 }
@@ -29,19 +52,14 @@ subprojects {
         plugin("com.jfrog.artifactory")
     }
 
-    val bintrayUser = findProperty("bintrayUser")?.toString()
-        ?: System.getenv("BINTRAY_USER")
-    val bintrayKey = findProperty("bintrayKey")?.toString()
-        ?: System.getenv("BINTRAY_API_KEY")
-
     publishing {
         repositories {
             maven {
-                name = "bintray"
-                url = uri("https://api.bintray.com/maven/arturbosch/code-analysis/detekt/;publish=1;override=1")
+                name = "mavenCentral"
+                url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2")
                 credentials {
-                    username = bintrayUser
-                    password = bintrayKey
+                    username = sonatypeUsername
+                    password = sonatypePassword
                 }
             }
         }

detekt-gradle-plugin/build.gradle.kts

@@ -18,7 +18,9 @@ dependencies {
 }
 
 gradlePlugin {
-    isAutomatedPublishing = false
+    // hack to prevent building two jar's overwriting each other and leading to invalid signatures
+    // when publishing the Gradle plugin, this property must be present
+    isAutomatedPublishing = System.getProperty("automatePublishing")?.toBoolean() ?: false
     plugins {
         register("detektPlugin") {
             id = "io.gitlab.arturbosch.detekt"

docs/_config.yml

@@ -113,4 +113,4 @@ description: "Meet detekt, a static code analysis tool for Kotlin."
 url: https://detekt.github.io/detekt/
 baseurl: /
 
-detekt_version: 1.12.0
+detekt_version: 1.13.1

docs/pages/changelog 1.x.x.md

@@ -5,6 +5,53 @@ keywords: changelog, release-notes, migration
 permalink: changelog.html
 toc: true
 ---
+#### 1.13.1 - 2020-09-13
+
+##### Notable Changes
+
+We now publish directly to maven central.
+The 1.13.0 release got corrupted and should not be used.
+
+#### 1.13.0 - 2020-09-07
+
+##### Migration
+
+- This release drops several deprecations in `detekt-api`.
+
+##### Changelog
+
+- Set modifier order based on Kotlin coding conventions - [#3056](https://github.com/detekt/detekt/pull/3056)
+- FunctionNaming: allow anonymous functions - [#3055](https://github.com/detekt/detekt/pull/3055)
+- FunctionNaming should ignore anonymous functions - [#3054](https://github.com/detekt/detekt/issues/3054)
+- Fix ModifierOrder for false positive reported by ModifierOrder when using fun interfaces - [#3051](https://github.com/detekt/detekt/pull/3051)
+- False positive reported by ModifierOrder when using fun interfaces - [#3050](https://github.com/detekt/detekt/issues/3050)
+- Fix PreferToOverPairSyntax exception - [#3046](https://github.com/detekt/detekt/pull/3046)
+- PreferToOverPairSyntax throws exceptions - [#3044](https://github.com/detekt/detekt/issues/3044)
+- Remove deprecated entity and location members - [#3037](https://github.com/detekt/detekt/pull/3037)
+- Respect configured config file when running the detektCreateConfig task - [#3036](https://github.com/detekt/detekt/pull/3036)
+- Remove last years api deprecations - [#3035](https://github.com/detekt/detekt/pull/3035)
+- UnusedImports rule: fix false negative when same name identifiers are imported and used - [#3033](https://github.com/detekt/detekt/pull/3033)
+- ForbiddenMethodCall: report operator calls - [#3032](https://github.com/detekt/detekt/pull/3032)
+- Improve documentation for Gradle repositories setup - [#3030](https://github.com/detekt/detekt/pull/3030)
+- how to use the type resolution to make ForbiddenMethodCall to check bigdecimal.equals using bigdecimal == bigdecimal? - [#3029](https://github.com/detekt/detekt/issues/3029)
+- Use lazy gradle APIs in docs - [#3028](https://github.com/detekt/detekt/pull/3028)
+- Implement option to turn config property deprecation warnings as errors - [#3026](https://github.com/detekt/detekt/pull/3026)
+- Fix RedundantSuspendModifier message - [#3025](https://github.com/detekt/detekt/pull/3025)
+- Print filtered paths in debug mode for easier bug tracing - [#3022](https://github.com/detekt/detekt/pull/3022)
+- Unused import not detected - [#3020](https://github.com/detekt/detekt/issues/3020)
+- Include reports and formatting features to the system test - [#3018](https://github.com/detekt/detekt/pull/3018)
+- detektGenerateConfig ignores detekt.config paramenter - [#2565](https://github.com/detekt/detekt/issues/2565)
+- Treat config property deprecations as errors - [#2545](https://github.com/detekt/detekt/issues/2545)
+- Print filtered paths in debug mode - [#869](https://github.com/detekt/detekt/issues/869)
+
+##### Housekeeping & Refactorings
+
+- Remove confusing annotation for UnusedImports rule - [#3039](https://github.com/detekt/detekt/pull/3039)
+- Remove obsolete signature workaround for formatting plugin - [#3038](https://github.com/detekt/detekt/pull/3038)
+- Upgrade to new dokka - [#2931](https://github.com/detekt/detekt/pull/2931)
+
+See all issues at: [1.13.0](https://github.com/detekt/detekt/milestone/75)
+
 #### 1.12.0 - 2020-08-25
 
 ##### Notable Changes

scripts/release.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 gradle build publishToMavenLocal -x detekt -x test
 gradle build
-gradle publishDetektPublicationPublicationToBintrayRepository
-gradle publishPlugins
+gradle publishAllPublicationsToMavenCentralRepository --max-workers 1
+gradle publishPlugins -DautomatePublishing=true
 gradle githubRelease
-gradle applyDocVersion
+gradle applyDocVersion applySelfAnalysisVersion