From 6cfaaee721bdb44ba8613e014f98355a8884fb28 Mon Sep 17 00:00:00 2001 From: Artur Bosch Date: Sun, 9 Dec 2018 12:58:07 +0100 Subject: [PATCH] Release rc12 (#1383) * Add rc12 changelog * Update release version * Update badges * Remove bintray publishing from gradle-plugin --- .github/CONTRIBUTING.md | 3 +- README.md | 4 +-- build.gradle.kts | 3 +- detekt-gradle-plugin/build.gradle.kts | 41 ++------------------------- docs/pages/changelog.md | 35 +++++++++++++++++++++++ gradle.properties | 4 +-- 6 files changed, 43 insertions(+), 47 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 114e605f9..6b9e0375a 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -94,8 +94,7 @@ Rules that contain an `@active` tag in their KDoc will be marked as active in th ### Release checklist -- new features? -> Update README.md / from `1.x.x` Wiki -- add changes in CHANGELOG.md -> `groovy github-milestone-report.groovy arturbosch/detekt [milestone-number]` +- add changes in CHANGELOG.md -> `groovy github-milestone-report.groovy arturbosch detekt [milestone-number]` - migrations expected? -> Add migration sub-section to current release changelog in CHANGELOG.md - all new contributors mentioned? -> README.md>Contributors, Update `all contributors`-Badge - new gradle-plugin release? -> Update gradle-version badge diff --git a/README.md b/README.md index 5e67822b6..02447d34b 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ [![codecov](https://codecov.io/gh/arturbosch/detekt/branch/master/graph/badge.svg)](https://codecov.io/gh/arturbosch/detekt) [![Download](https://api.bintray.com/packages/arturbosch/code-analysis/detekt/images/download.svg) ](https://bintray.com/arturbosch/code-analysis/detekt/_latestVersion) -[![gradle plugin](https://img.shields.io/badge/Gradle-1.0.0--RC11-blue.svg)](https://plugins.gradle.org/plugin/io.gitlab.arturbosch.detekt) +[![gradle plugin](https://img.shields.io/badge/Gradle-1.0.0--RC12-blue.svg)](https://plugins.gradle.org/plugin/io.gitlab.arturbosch.detekt) -[![All Contributors](https://img.shields.io/badge/all_contributors-69-orange.svg?style=flat-square)](#contributors) +[![All Contributors](https://img.shields.io/badge/all_contributors-71-orange.svg?style=flat-square)](#contributors) [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) Meet _detekt_, a static code analysis tool for the _Kotlin_ programming language. diff --git a/build.gradle.kts b/build.gradle.kts index 6ed851d99..a6125289a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ plugins { kotlin("jvm") version "1.3.11" id("com.jfrog.bintray") version "1.8.4" id("com.github.ben-manes.versions") version "0.20.0" - id("com.github.johnrengelman.shadow") version "4.0.1" apply false + id("com.github.johnrengelman.shadow") version "4.0.3" apply false id("org.sonarqube") version "2.6.2" id("io.gitlab.arturbosch.detekt") id("org.jetbrains.dokka") version "0.9.17" @@ -128,7 +128,6 @@ subprojects { showExceptions = true showCauses = true showStackTraces = true - } } diff --git a/detekt-gradle-plugin/build.gradle.kts b/detekt-gradle-plugin/build.gradle.kts index 5e3ffd5d9..dc662acdb 100644 --- a/detekt-gradle-plugin/build.gradle.kts +++ b/detekt-gradle-plugin/build.gradle.kts @@ -1,9 +1,6 @@ -import com.gradle.publish.PluginConfig -import com.jfrog.bintray.gradle.BintrayExtension import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.gradle.api.tasks.testing.logging.TestLogEvent import org.jetbrains.dokka.gradle.DokkaTask -import java.util.Date buildscript { repositories { @@ -32,12 +29,12 @@ apply { } group = "io.gitlab.arturbosch.detekt" -version = "1.0.0-RC11" +version = "1.0.0-RC12" val detektGradleVersion: String by project val jcommanderVersion: String by project val spekVersion = "1.2.1" -val junitPlatformVersion = "1.3.1" +val junitPlatformVersion = "1.3.2" val assertjVersion = "3.11.1" dependencies { @@ -91,39 +88,6 @@ pluginBundle { } } -bintray { - user = System.getenv("BINTRAY_USER") ?: "" - key = System.getenv("BINTRAY_API_KEY") ?: "" - val mavenCentralUser = System.getenv("MAVEN_CENTRAL_USER") ?: "" - val mavenCentralPassword = System.getenv("MAVEN_CENTRAL_PW") ?: "" - - setPublications("DetektPublication") - - pkg(delegateClosureOf { - repo = "code-analysis" - name = "detekt" - userOrg = "arturbosch" - setLicenses("Apache-2.0") - vcsUrl = "https://github.com/arturbosch/detekt" - - version(delegateClosureOf { - name = project.version as? String - released = Date().toString() - - gpg(delegateClosureOf { - sign = true - }) - - mavenCentralSync(delegateClosureOf { - sync = true - user = mavenCentralUser - password = mavenCentralPassword - close = "1" - }) - }) - }) -} - tasks.withType(DokkaTask::class.java) { // suppresses undocumented classes but not dokka warnings // https://github.com/Kotlin/dokka/issues/229 && https://github.com/Kotlin/dokka/issues/319 @@ -132,7 +96,6 @@ tasks.withType(DokkaTask::class.java) { outputDirectory = "$buildDir/javadoc" } - val generateDefaultDetektVersionFile by tasks.creating { val defaultDetektVersionFile = File("$buildDir/generated/src/io/gitlab/arturbosch/detekt", "PluginVersion.kt") diff --git a/docs/pages/changelog.md b/docs/pages/changelog.md index 9567f148b..acccdc1df 100644 --- a/docs/pages/changelog.md +++ b/docs/pages/changelog.md @@ -13,6 +13,41 @@ toc: true --> +#### RC12 + +##### Changelog + +- Actually print the exception message next to the stacktrace - [#1378](https://github.com/arturbosch/detekt/pull/1378) +- Added support for JSR test infrastructure in documentation ruleset - [#1377](https://github.com/arturbosch/detekt/pull/1377) +- Actually load the manifest to report detekt's version - [#1376](https://github.com/arturbosch/detekt/pull/1376) +- fix typo - [#1374](https://github.com/arturbosch/detekt/pull/1374) +- Drop JDK 9 & 10 from CI - [#1371](https://github.com/arturbosch/detekt/pull/1371) +- Add EqualsOnSignatureLine - [#1370](https://github.com/arturbosch/detekt/pull/1370) +- Do not add +1 complexity for nested functions inside functions - [#1365](https://github.com/arturbosch/detekt/pull/1365) +- Do not report expect'ed annotation classes with an empty constructor … - [#1364](https://github.com/arturbosch/detekt/pull/1364) +- Add more talks mentioning detekt - [#1363](https://github.com/arturbosch/detekt/pull/1363) +- false positive EmptyDefaultConstructor for annotation - [#1362](https://github.com/arturbosch/detekt/issues/1362) +- Mention published url change in the migration guide - [#1361](https://github.com/arturbosch/detekt/pull/1361) +- Support multiple it refs in UnnecessaryLet (#1359) - [#1360](https://github.com/arturbosch/detekt/pull/1360) +- Allow multiple 'it' references in UnnecessaryLet - [#1359](https://github.com/arturbosch/detekt/issues/1359) +- Fix link to contributing guideline in PR template - [#1358](https://github.com/arturbosch/detekt/pull/1358) +- Updated groovydsl version doc - [#1353](https://github.com/arturbosch/detekt/pull/1353) +- gradle plugin min gradle version - [#1352](https://github.com/arturbosch/detekt/issues/1352) +- Hide dev flags in CLI - [#1351](https://github.com/arturbosch/detekt/pull/1351) +- Filter wildcards for type references as they can be null - Closes #1345 - [#1349](https://github.com/arturbosch/detekt/pull/1349) +- I can't please detekt and/or ktlint with the following - what's kotlin idiomatic approach - [#1348](https://github.com/arturbosch/detekt/issues/1348) +- False positive UnusedPrivateClass in RC11 - [#1347](https://github.com/arturbosch/detekt/issues/1347) +- UnusedPrivateClass check led to an exception - [#1345](https://github.com/arturbosch/detekt/issues/1345) +- Added support for JSR test infrasture in performance ruleset - [#1343](https://github.com/arturbosch/detekt/pull/1343) +- Added SwallowedException ignore type config - [#1342](https://github.com/arturbosch/detekt/pull/1342) +- RC10 not published? - [#1339](https://github.com/arturbosch/detekt/issues/1339) +- Allow to exclude labeled return statements - #1317 - [#1336](https://github.com/arturbosch/detekt/pull/1336) +- Updated kotlin version to 1.3.10 - [#1332](https://github.com/arturbosch/detekt/pull/1332) +- Don't publish Gradle plugin to Bintray - [#1161](https://github.com/arturbosch/detekt/pull/1161) +- ComplexMethod false positive for returning anonymous inner class - [#1037](https://github.com/arturbosch/detekt/issues/1037) + +See all issues at: [RC12](https://github.com/arturbosch/detekt/milestone/41) + #### RC11 ##### Migration diff --git a/gradle.properties b/gradle.properties index abfa44a4c..76de52c39 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -detektVersion=1.0.0-RC11 -usedDetektVersion=1.0.0-RC11 +detektVersion=1.0.0-RC12 +usedDetektVersion=1.0.0-RC12 ktlintVersion=0.29.0 spekVersion=1.2.1 junitPlatformVersion=1.3.1