diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 6ba05b62b..84f661b6f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -93,7 +93,7 @@ Following warning is expected until [Jekyll](https://github.com/jekyll/jekyll/is - `gradle increment` - `gradle build publishToMavenLocal -x detekt -x test` - publish to local first - `gradle build` - now fully build with tests and self-analysis. -- `gradle bintrayUpload` - uploads artifacts to Bintray +- `gradle publishDetektPublicationPublicationToBintrayRepository` - uploads artifacts to Bintray - `gradle publishPlugins` - uploads the Gradle Plugin to the Plugin Repositories - `gradle githubRelease` - creates a tag for the current version with changelog and cli jar - `gradle applyDocVersion applySelfAnalysisVersion` diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 57edef98a..94776324d 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -17,7 +17,6 @@ object Plugins { const val DETEKT = "1.10.0" const val GITHUB_RELEASE = "2.2.12" const val ARTIFACTORY = "4.15.1" - const val BINTRAY = "1.8.4" const val SHADOW = "5.2.0" const val VERSIONS = "0.28.0" const val SONAR = "2.8" @@ -30,7 +29,6 @@ dependencies { implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${Plugins.DETEKT}") implementation("com.github.breadmoirai:github-release:${Plugins.GITHUB_RELEASE}") implementation("org.jfrog.buildinfo:build-info-extractor-gradle:${Plugins.ARTIFACTORY}") - implementation("com.jfrog.bintray.gradle:gradle-bintray-plugin:${Plugins.BINTRAY}") implementation("com.github.jengelman.gradle.plugins:shadow:${Plugins.SHADOW}") implementation("com.github.ben-manes:gradle-versions-plugin:${Plugins.VERSIONS}") implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:${Plugins.SONAR}") diff --git a/buildSrc/src/main/kotlin/packaging.gradle.kts b/buildSrc/src/main/kotlin/packaging.gradle.kts index b07f38a04..328ef87e3 100644 --- a/buildSrc/src/main/kotlin/packaging.gradle.kts +++ b/buildSrc/src/main/kotlin/packaging.gradle.kts @@ -1,5 +1,4 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import com.jfrog.bintray.gradle.BintrayExtension import groovy.lang.GroovyObject import org.jfrog.gradle.plugin.artifactory.dsl.ArtifactoryPluginConvention import org.jfrog.gradle.plugin.artifactory.dsl.PublisherConfig @@ -9,7 +8,6 @@ plugins { `java-library` apply false // is applied in commons; make configurations available in this script `maven-publish` apply false id("com.jfrog.artifactory") apply false - id("com.jfrog.bintray") apply false } project(":detekt-cli") { @@ -27,7 +25,6 @@ subprojects { apply { plugin("maven-publish") - plugin("com.jfrog.bintray") plugin("com.jfrog.artifactory") } @@ -36,40 +33,17 @@ subprojects { val bintrayKey = findProperty("bintrayKey")?.toString() ?: System.getenv("BINTRAY_API_KEY") - bintray { - user = bintrayUser - key = bintrayKey - val mavenCentralUser = System.getenv("MAVEN_CENTRAL_USER") ?: "" - val mavenCentralPassword = System.getenv("MAVEN_CENTRAL_PW") ?: "" - - setPublications(DETEKT_PUBLICATION) - - pkg(delegateClosureOf { - repo = "code-analysis" - name = "detekt" - userOrg = "arturbosch" - setLicenses("Apache-2.0") - vcsUrl = "https://github.com/detekt/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" - }) - }) - }) - } - publishing { + repositories { + maven { + name = "bintray" + url = uri("https://api.bintray.com/maven/arturbosch/code-analysis/detekt/;publish=1;override=1") + credentials { + username = bintrayUser + password = bintrayKey + } + } + } publications.register(DETEKT_PUBLICATION) { groupId = project.group as? String artifactId = project.name diff --git a/gradle.properties b/gradle.properties index d0f00f874..7eb3b6c12 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,3 +3,5 @@ systemProp.sonar.host.url=http://localhost:9000 systemProp.file.encoding=UTF-8 org.gradle.parallel=true org.gradle.caching=true +# Needed for https://github.com/gradle/gradle/issues/11412 +systemProp.org.gradle.internal.publish.checksums.insecure=true