Skip to content

Commit

Permalink
Merge pull request #38 from IntershopCommunicationsAG/update_all
Browse files Browse the repository at this point in the history
Update all
  • Loading branch information
m-raab authored Nov 21, 2020
2 parents d1f0e8c + 4740afb commit d92d951
Show file tree
Hide file tree
Showing 11 changed files with 178 additions and 141 deletions.
2 changes: 1 addition & 1 deletion README.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ To apply the JAXB Gradle Plugin to your projects, add the following in your buil
.build.gradle
----
plugins {
id 'com.intershop.gradle.jaxb' version '{latestRevision}'
id 'com.intershop.gradle.jaxb' version 'It is not necessary to apply this plugin to a project separately.'
}
jaxb {
Expand Down
24 changes: 13 additions & 11 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins {
// project plugins
`java-gradle-plugin`
groovy
id("nebula.kotlin") version "1.3.61"
kotlin("jvm") version "1.3.72"

// test coverage
jacoco
Expand All @@ -33,22 +33,22 @@ plugins {
`maven-publish`

// intershop version plugin
id("com.intershop.gradle.scmversion") version "6.1.0"
id("com.intershop.gradle.scmversion") version "6.2.0"

// plugin for documentation
id("org.asciidoctor.jvm.convert") version "2.4.0"
id("org.asciidoctor.jvm.convert") version "3.2.0"

// documentation
id("org.jetbrains.dokka") version "0.10.0"
id("org.jetbrains.dokka") version "0.10.1"

// code analysis for kotlin
id("io.gitlab.arturbosch.detekt") version "1.4.0"
id("io.gitlab.arturbosch.detekt") version "1.11.0"

// plugin for publishing to Gradle Portal
id("com.gradle.plugin-publish") version "0.10.1"
id("com.gradle.plugin-publish") version "0.12.0"

// plugin for publishing to jcenter
id("com.jfrog.bintray") version "1.8.4"
id("com.jfrog.bintray") version "1.8.5"
}

scm {
Expand All @@ -74,8 +74,9 @@ gradlePlugin {
}

pluginBundle {
website = "https://github.com/IntershopCommunicationsAG/${project.name}"
vcsUrl = "https://github.com/IntershopCommunicationsAG/${project.name}"
val pluginURL = "https://github.com/IntershopCommunicationsAG/${project.name}"
website = pluginURL
vcsUrl = pluginURL
tags = listOf("intershop", "gradle", "plugin", "jaxb", "build", "code", "generator")
}

Expand All @@ -100,7 +101,7 @@ tasks {
showStandardStreams = true
}

systemProperty("intershop.gradle.versions", "6.0, 6.1, 6.2")
systemProperty("intershop.gradle.versions", "6.6,6.7")

if(project.hasProperty("repoURL")
&& project.hasProperty("repoUser")
Expand Down Expand Up @@ -273,10 +274,11 @@ bintray {

dependencies {
compileOnly("org.jetbrains:annotations:18.0.0")
implementation(gradleApi())
implementation(gradleKotlinDsl())

testImplementation("commons-io:commons-io:2.2")
testImplementation("com.intershop.gradle.test:test-gradle-plugin:3.4.0")
testImplementation("com.intershop.gradle.test:test-gradle-plugin:3.7.0")
testImplementation(gradleTestKit())

}
Expand Down
Loading

0 comments on commit d92d951

Please sign in to comment.