🐛 Make configuration as proto generate task input (#58)

* ⬆️ Upgrade dependencies ⬆️ Spring Boot 2.3.1 -> 2.3.2 ⬆️ Swagger 2.1.3 -> 2.1.4 ⬆️ Nebula Gradle Info 8.3.2 -> 8.4.0 ⬆️ JGit 5.7.0.202003110725-r -> 5.7.0.202007141445-r * 🐛 Make configuration as proto generate task input * 🚨 Make ktlint happy * 💚 Fix build with 0.0.6-M0 protobuf plugin
ButterCam · Jul 28, 2020 · 96334fd · 96334fd
1 parent b647b6f
commit 96334fd
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 18 deletions.
diff --git a/.gitmoji-changelogrc b/.gitmoji-changelogrc
@@ -2,6 +2,6 @@
   "project": {
     "name": "sisyphus",
     "description": "Sisyphus is the way how we provide backend services.",
-    "version": "0.0.6-M0"
+    "version": "0.0.6-M1"
   }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -73,16 +73,18 @@
 -  Add LICENSE [[59e9ae3](https://github.com/ButterCam/sisyphus/commit/59e9ae38ac8cece9fac5cf054eb3dcc5cd7436fe)]
 
 
-<a name="0.0.6-M0"></a>
-## 0.0.6-M0 (2020-07-27)
+<a name="0.0.6-M1"></a>
+## 0.0.6-M1 (2020-07-28)
 
 ### Changed
 
-- 🔧 Add gitmoji changelog support [[1bfb19f](https://github.com/ButterCam/sisyphus/commit/1bfb19f1358722e87962b92b08641d6b2bc0dfa8)]
+- ⬆️ Upgrade dependencies ⬆️ Spring Boot 2.3.1 -&gt; 2.3.2 ⬆️ Swagger 2.1.3 -&gt; 2.1.4 ⬆️ Nebula Gradle Info 8.3.2 -&gt; 8.4.0 ⬆️ JGit 5.7.0.202003110725-r -&gt; 5.7.0.202007141445-r [[c3c8b4b](https://github.com/ButterCam/sisyphus/commit/c3c8b4b0c2780c5daa320363ce7be03fbc4a156a)]
+- 🔧 Add gitmoji changelog support ([#56](https://github.com/ButterCam/sisyphus/issues/56)) [[f14eb09](https://github.com/ButterCam/sisyphus/commit/f14eb09a041acdab830b0baf9aa972ca0f0e4821)]
 - ♻️ Separate proto from lib module ([#55](https://github.com/ButterCam/sisyphus/issues/55)) [[26a1121](https://github.com/ButterCam/sisyphus/commit/26a1121e4265d31982970820e76715e29547b934)]
 
 ### Miscellaneous
 
+- 📝 Update changelog [[a86b7e4](https://github.com/ButterCam/sisyphus/commit/a86b7e49b091843bf07c2d872f1c8e5b41a60c1f)]
 -  Add gradle and jdk badge ([#54](https://github.com/ButterCam/sisyphus/issues/54)) [[a99e5e0](https://github.com/ButterCam/sisyphus/commit/a99e5e03c6d8be25801e09c0fb2a987fefd089bf)]
 -  Add unit tests for sisyphus-grpc cel module ([#49](https://github.com/ButterCam/sisyphus/issues/49)) [[a8cf64d](https://github.com/ButterCam/sisyphus/commit/a8cf64dcd410f26186c99630e83da948527f99a9)]
 -  Throw exception when running cel with syntax error ([#53](https://github.com/ButterCam/sisyphus/issues/53)) [[f9ecd10](https://github.com/ButterCam/sisyphus/commit/f9ecd10049698f600e2f30704d0df2c4736bf86b)]

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -2,11 +2,11 @@ plugins {
     `java-library`
     `kotlin-dsl`
     id("idea")
-    id("com.bybutter.sisyphus.project") version "0.0.5"
+    id("com.bybutter.sisyphus.project") version "0.0.6-M0"
 }
 
 dependencies {
-    implementation(platform("com.bybutter.sisyphus:sisyphus-dependencies:0.0.5"))
+    implementation(platform("com.bybutter.sisyphus:sisyphus-dependencies:0.0.6-M0"))
     implementation("com.bybutter.sisyphus.tools:sisyphus-protobuf-gradle-plugin")
     implementation("com.bybutter.sisyphus.tools:sisyphus-project-gradle-plugin")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin")

diff --git a/dependencies/build.gradle.kts b/dependencies/build.gradle.kts
@@ -13,7 +13,7 @@ javaPlatform {
 
 dependencies {
     api(platform(project(":sisyphus-bom")))
-    api(platform("org.springframework.boot:spring-boot-dependencies:2.3.1.RELEASE"))
+    api(platform("org.springframework.boot:spring-boot-dependencies:2.3.2.RELEASE"))
     api(platform("io.micrometer:micrometer-bom:1.5.2"))
     api(platform("org.jetbrains.kotlin:kotlin-bom:1.3.72"))
     api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.3.8"))
@@ -36,20 +36,20 @@ dependencies {
         api("com.squareup.retrofit2:retrofit:2.9.0")
         api("io.github.resilience4j:resilience4j-retrofit:1.5.0")
         api("org.antlr:antlr4:4.8")
-        api("io.swagger.core.v3:swagger-core:2.1.3")
+        api("io.swagger.core.v3:swagger-core:2.1.4")
         api("org.jooq:jooq:3.13.3")
         api("com.google.api.grpc:proto-google-common-protos:1.18.0")
         api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
         api("org.jetbrains.kotlin:kotlin-allopen:1.3.72")
-        api("org.springframework.boot:spring-boot-gradle-plugin:2.3.1.RELEASE")
+        api("org.springframework.boot:spring-boot-gradle-plugin:2.3.2.RELEASE")
         api("org.jlleitschuh.gradle:ktlint-gradle:9.2.1")
         api("com.github.ben-manes:gradle-versions-plugin:0.28.0")
         api("com.netflix.nebula:nebula-publishing-plugin:17.3.0")
         api("com.netflix.nebula:gradle-contacts-plugin:5.1.0")
-        api("com.netflix.nebula:gradle-info-plugin:8.3.2")
+        api("com.netflix.nebula:gradle-info-plugin:8.4.0")
         api("org.gradle.kotlin:plugins:1.3.6")
         api("com.gradle.publish:plugin-publish-plugin:0.12.0")
-        api("org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r")
+        api("org.eclipse.jgit:org.eclipse.jgit:5.7.0.202007141445-r")
         api("com.palantir.gradle.docker:gradle-docker:0.25.0")
         api("io.grpc:grpc-kotlin-stub:0.1.4")
     }

diff --git a/...f-gradle-plugin/src/main/kotlin/com/bybutter/sisyphus/protobuf/gradle/ExtractProtoTask.kt b/...f-gradle-plugin/src/main/kotlin/com/bybutter/sisyphus/protobuf/gradle/ExtractProtoTask.kt
@@ -10,15 +10,15 @@ import java.nio.file.Path
 import java.nio.file.Paths
 import java.nio.file.SimpleFileVisitor
 import java.nio.file.attribute.BasicFileAttributes
+import org.gradle.api.DefaultTask
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.file.FileCollection
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.OutputDirectory
-import org.gradle.api.tasks.SourceTask
 import org.gradle.api.tasks.TaskAction
 
-open class ExtractProtoTask : SourceTask() {
+open class ExtractProtoTask : DefaultTask() {
     @get:InputFiles
     lateinit var input: FileCollection
 

diff --git a/...-gradle-plugin/src/main/kotlin/com/bybutter/sisyphus/protobuf/gradle/ProtoGenerateTask.kt b/...-gradle-plugin/src/main/kotlin/com/bybutter/sisyphus/protobuf/gradle/ProtoGenerateTask.kt
@@ -7,12 +7,12 @@ import com.google.protobuf.DescriptorProtos
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.Paths
+import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.InputDirectory
 import org.gradle.api.tasks.OutputDirectory
-import org.gradle.api.tasks.SourceTask
 import org.gradle.api.tasks.TaskAction
 
-open class ProtoGenerateTask : SourceTask() {
+open class ProtoGenerateTask : DefaultTask() {
     @get:InputDirectory
     lateinit var protoPath: File
 

diff --git a/...buf-gradle-plugin/src/main/kotlin/com/bybutter/sisyphus/protobuf/gradle/ProtobufPlugin.kt b/...buf-gradle-plugin/src/main/kotlin/com/bybutter/sisyphus/protobuf/gradle/ProtobufPlugin.kt
@@ -113,8 +113,6 @@ class ProtobufPlugin : Plugin<Project> {
             it.description = "Extract protos for '${sourceSet.name}' source set."
             it.protobuf = extension
 
-            it.source(inputDir)
-
             it.dependsOn(target.proto(sourceSet))
             it.dependsOn(target.protoApi(sourceSet))
         }.get()
@@ -150,7 +148,6 @@ class ProtobufPlugin : Plugin<Project> {
             it.description = "Generate protos for '${sourceSet.name}' source set."
 
             it.dependsOn(extractTask)
-            it.source(extractTask.protoPath)
         }.get()
 
         target.extensions.findByType(IdeaModel::class.java)?.apply {