Merge pull request #22 from line/develop/v1.1.0

Develop/v1.1.0

Author: Gyeongil Goo

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,9 +1,9 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
+title: "[plugin-name] Summary of the bug you found"
+labels: bug
+assignees: yuinacor
 
 ---
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,8 +2,8 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: ''
-assignees: ''
+labels: enhancement
+assignees: yuinacor
 
 ---
 

.github/workflows/publish.yml

@@ -0,0 +1,24 @@
+name: Gradle Plugin Publish
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    name: Publish plugin to gradle plugins portal
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 12
+        uses: actions/setup-java@v1
+        with:
+          java-version: 12
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - run: cat ./gradle.properties
+      - name: Publish plugins with gradle
+        env:
+          GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
+          GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}
+        run: ./gradlew publishPlugins -Pgradle.publish.key=$GRADLE_PUBLISH_KEY -Pgradle.publish.secret=$GRADLE_PUBLISH_SECRET

.github/workflows/pull-request.yml

@@ -0,0 +1,27 @@
+name: Java CI
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ${{matrix.os}}
+    strategy:
+      matrix:
+        java: [8, 9, 10, 11, 12]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    name: java ${{matrix.java}} runner over ${{matrix.os}}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK ${{matrix.java}}
+      uses: actions/setup-java@v1
+      with:
+        java-version: ${{matrix.java}}
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Check with Gradle
+      run: ./gradlew check --parallel --no-daemon
+    - uses: actions/upload-artifact@v1
+      if: failure()
+      with:
+        name: ${{matrix.os}}_${{matrix.java}}
+        path: "./"

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "sample"]
+	path = recursive-git-log-plugin/src/test/resources/sample
+	url = https://github.com/line/gradle-multi-project-support-sample.git
+	branch = master

build-recipe-plugin/README.md

@@ -1,5 +1,7 @@
 # Build Recipe Plugin
 
+[![Gradle Plugin Portal](https://img.shields.io/maven-metadata/v/https/plugins.gradle.org/m2/com/linecorp/build-recipe-plugin/com.linecorp.build-recipe-plugin.gradle.plugin/maven-metadata.xml.svg?colorB=007ec6&label=Gradle%20Plugin%20Portal)](https://plugins.gradle.org/plugin/com.linecorp.build-recipe-plugin)
+
 A Gradle plugin which makes your build configuration **reusable** and **centralized**.
 
 We were strongly inspired by [Armeria's build scripts](https://github.com/line/armeria/tree/master/gradle/scripts).

build-recipe-plugin/build.gradle.kts

@@ -22,11 +22,6 @@ gradlePlugin {
             implementationClass = "com.linecorp.support.project.multi.recipe.BuildRecipePlugin"
         }
     }
-
-    dependencies {
-        testImplementation("io.mockk:mockk:1.8.13")
-        testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.19")
-    }
 }
 
 pluginBundle {

build-recipe-plugin/src/test/kotlin/com/linecorp/support/project/multi/recipe/FunctionalTest.kt

@@ -17,7 +17,8 @@
 package com.linecorp.support.project.multi.recipe
 
 import assertk.assertThat
-import assertk.assertions.isTrue
+import assertk.assertions.contains
+import org.gradle.kotlin.dsl.support.normaliseLineSeparators
 import org.gradle.testkit.runner.GradleRunner
 import org.junit.jupiter.api.Test
 import java.nio.file.Paths
@@ -69,7 +70,7 @@ project ':juice:api:protocol' is configured by
 project ':juice:api:server' is configured by 
  - type prefix [java]
  - type having [boot]
- - type suffix [boot-application]""".trimIndent()
+ - type suffix [boot-application]""".trimIndent().normaliseLineSeparators()
 
     @Test
     fun `kotlin dsl test`() {
@@ -78,11 +79,11 @@ project ':juice:api:server' is configured by
         GradleRunner.create()
                 .withProjectDir(file.toFile())
                 .withPluginClasspath()
-                .withArguments("allProjectReport", "--stacktrace")
-                .withGradleVersion("5.5.1")
+                .withArguments("allProjectReport")
                 .build()
                 .also { println(it.output) }
-                .also { assertThat(it.output.contains(expected)).isTrue() }
+                .let { it.output.normaliseLineSeparators() }
+                .also { assertThat(it).contains(expected) }
     }
 
     @Test
@@ -92,10 +93,10 @@ project ':juice:api:server' is configured by
         GradleRunner.create()
                 .withProjectDir(file.toFile())
                 .withPluginClasspath()
-                .withArguments("allProjectReport", "--stacktrace")
-                .withGradleVersion("5.5.1")
+                .withArguments("allProjectReport")
                 .build()
                 .also { println(it.output) }
-                .also { assertThat(it.output.contains(expected)).isTrue() }
+                .let { it.output.normaliseLineSeparators() }
+                .also { assertThat(it).contains(expected) }
     }
 }

build.gradle.kts

@@ -92,6 +92,8 @@ configure(byTypeSuffix("gradle-plugin") and byLabel("junit5-platform")) {
         testImplementation("org.junit.jupiter:junit-jupiter-params:5.5.1")
 
         testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.1")
+        testImplementation("io.mockk:mockk:1.9.3")
+        testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.21")
     }
 
     tasks {

gradle.properties

@@ -15,4 +15,4 @@
 #
 kotlin.code.style=official
 group=com.linecorp.support.project.multi
-version=1.0.2-SNAPSHOT
+version=1.1.1