update to pixeloutlaw-gradle-plugin 3.0.0

PixelOutlaw · Feb 7, 2021 · c5265a5 · c5265a5
1 parent 11890a6
commit c5265a5
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 34 deletions.
diff --git a/.github/cdk/package.json b/.github/cdk/package.json
@@ -13,7 +13,7 @@
     "upgrade-cdk": "yarn upgrade cdkactions@latest cdkactions-cli@latest"
   },
   "dependencies": {
-    "@pixeloutlaw/github-cdkactions": "3.0.0",
+    "@pixeloutlaw/github-cdkactions": "3.1.0",
     "cdkactions": "0.2.3",
     "constructs": "3.2.109"
   },

diff --git a/.github/cdk/yarn.lock b/.github/cdk/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@pixeloutlaw/github-cdkactions@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@pixeloutlaw/github-cdkactions/-/github-cdkactions-3.0.0.tgz#b736f8a1bb47f1c9d0b0b46db46bcc5884929a24"
-  integrity sha512-lROvDUK2ffRn3aonT2hR8Ksvk3KaI7GzjLo4iH+QTNkswKgKhqSH+9cn9cd6S702+31qkjJxWNfOnsa78AQ9/A==
+"@pixeloutlaw/github-cdkactions@3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@pixeloutlaw/github-cdkactions/-/github-cdkactions-3.1.0.tgz#e9abf5110286c8f87404844122d8f438ce98a41f"
+  integrity sha512-DtScSdKIhMVq5/725BVdSLrxzBrtxRx6SgfPqycL5LQ+1jHDR4DlgwPEMdNljL7P6KtgrEAVtoHXGYnhleyrfw==
   dependencies:
     cdkactions "^0.2.3"
     constructs "^3.3.12"

diff --git a/.github/workflows/cdkactions_prepare-for-release.yaml b/.github/workflows/cdkactions_prepare-for-release.yaml
@@ -15,12 +15,12 @@ jobs:
         with:
           fetch-depth: 0
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/[email protected].7
+        uses: gittools/actions/gitversion/[email protected].9
         with:
           versionSpec: 5.x
       - name: Determine Version
         id: gitversion
-        uses: gittools/actions/gitversion/[email protected].7
+        uses: gittools/actions/gitversion/[email protected].9
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -0,0 +1 @@
+next-version: 2.0.0
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     kotlin("jvm") version "1.4.30" apply false
-    id("io.pixeloutlaw.multi") version "2.0.7"
+    id("io.pixeloutlaw.gradle") version "3.0.0"
     id("io.pixeloutlaw.gradle.buildconfigkt") apply false
 }
 

diff --git a/buildconfig-gradle-plugin/build.gradle.kts b/buildconfig-gradle-plugin/build.gradle.kts
@@ -1,17 +1,14 @@
 plugins {
     `kotlin-dsl`
-    `maven-publish`
-    id("org.jlleitschuh.gradle.ktlint")
-    id("io.gitlab.arturbosch.detekt")
-    id("org.jetbrains.dokka")
+    id("io.pixeloutlaw.gradle")
     id("com.gradle.plugin-publish")
 }
 
 group = "io.pixeloutlaw.gradle"
 
 repositories {
     gradlePluginPortal()
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
@@ -24,10 +21,6 @@ dependencies {
     testImplementation("com.google.truth:truth:_")
 }
 
-detekt {
-    baseline = file("baseline.xml")
-}
-
 gradlePlugin {
     plugins {
         create("buildConfigKt") {
@@ -39,25 +32,8 @@ gradlePlugin {
     }
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-    withJavadocJar()
-    withSourcesJar()
-}
-
 pluginBundle {
     website = "https://github.com/PixelOutlaw/buildconfig-gradle-plugin"
     vcsUrl = "https://github.com/PixelOutlaw/buildconfig-gradle-plugin"
     tags = listOf("kotlin", "build", "config", "buildconfig")
 }
-
-tasks.getByName("javadocJar", Jar::class) {
-    dependsOn("dokkaJavadoc")
-    from(buildDir.resolve("dokka/javadoc"))
-}
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>() {
-    dependsOn("ktlintFormat")
-    kotlinOptions.jvmTarget = "1.8"
-}
diff --git a/buildconfig-gradle-plugin/versions.properties b/buildconfig-gradle-plugin/versions.properties
@@ -13,6 +13,8 @@ plugin.org.jetbrains.dokka=1.4.20
 
 plugin.org.jlleitschuh.gradle.ktlint=9.4.1
 
+plugin.io.pixeloutlaw.gradle=3.0.0
+
 version.kotlin=1.4.30
 
 version.kotlinpoet=1.7.2