✨ Support server side stream gRPC transcoding via http event… (#488)

* ✨ Support server side stream gRPC transcoding via http event stream * 💚 Using gradle 7.5.1 * 💚 Using gradle 7.5.1 * Chmod * ⬆️ Upgrade to gradle 8 and kotlin 1.8.10
ButterCam · Mar 9, 2023 · fa25429 · fa25429
1 parent 6940042
commit fa25429
Show file tree

Hide file tree

Showing 127 changed files with 780 additions and 2,631 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,4 +23,4 @@ jobs:
           dependency-repositories: local,central,portal,google,snapshot
           snapshot-url: https://s01.oss.sonatype.org/content/repositories/snapshots
       - name: Build with Gradle
-        run: gradle build
+        run: gradle build --no-daemon
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -40,7 +40,7 @@ jobs:
           gradle-portal-secret: ${{ secrets.GRADLE_PUBLISH_SECRET }}
           gpg-key-name: ${{ secrets.GPG_KEY_NAME }}
       - name: Publish with Gradle
-        run: gradle publish
+        run: gradle publish --no-daemon
       - name: Publish plugins to Gradle Portal
         if: ${{ github.event_name == 'release' }}
-        run: gradle publishPlugins
+        run: gradle publishPlugins --no-daemon
diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     `java-platform`
-    id("nebula.maven-publish")
+    id("com.netflix.nebula.maven-publish")
     sisyphus
 }
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("nebula.contacts")
+    id("com.netflix.nebula.contacts")
 }
 
 contacts {
@@ -8,19 +8,4 @@ contacts {
         github = "devkanro"
         roles.add("owner")
     })
-    addPerson("[email protected]", delegateClosureOf<nebula.plugin.contacts.Contact> {
-        moniker = "wangzheng"
-        github = "GuoDuanLZ"
-        roles.add("maintainer")
-    })
-    addPerson("[email protected]", delegateClosureOf<nebula.plugin.contacts.Contact> {
-        moniker = "future"
-        github = "yuxin-zhao"
-        roles.add("maintainer")
-    })
-    addPerson("[email protected]", delegateClosureOf<nebula.plugin.contacts.Contact> {
-        moniker = "ZhangJin"
-        github = "ZhangJin233"
-        roles.add("tester")
-    })
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -11,18 +11,14 @@ repositories {
 }
 
 dependencies {
-    implementation(platform("com.bybutter.sisyphus:sisyphus-dependencies:1.5.31"))
-    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")
-    implementation("org.jetbrains.kotlin:kotlin-allopen")
-    implementation("org.springframework.boot:spring-boot-gradle-plugin")
-    implementation("org.jlleitschuh.gradle:ktlint-gradle")
-    implementation("com.github.ben-manes:gradle-versions-plugin")
-    implementation("com.netflix.nebula:nebula-publishing-plugin")
-    implementation("com.netflix.nebula:gradle-contacts-plugin")
-    implementation("com.netflix.nebula:gradle-info-plugin")
-    implementation("org.gradle.kotlin:plugins")
-    implementation("com.gradle.publish:plugin-publish-plugin")
-    implementation("org.eclipse.jgit:org.eclipse.jgit")
+    implementation(libs.nebula.contacts)
+    implementation(libs.nebula.info)
+    implementation(libs.nebula.publishing)
+    implementation(libs.gradle.sisyphus)
+    implementation(libs.gradle.sisyphus.protobuf)
+    implementation(libs.gradle.ktlint)
+    implementation(libs.gradle.spring)
+    implementation(libs.gradle.kotlin)
+    implementation(libs.gradle.kotlin.allopen)
+    implementation(libs.gradle.plugin.publish)
 }
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt
diff --git a/buildSrc/src/main/kotlin/kotlin.kt b/buildSrc/src/main/kotlin/kotlin.kt
diff --git a/buildSrc/src/main/kotlin/project.kt b/buildSrc/src/main/kotlin/project.kt
@@ -1,5 +1,4 @@
 import com.bybutter.sisyphus.project.gradle.SisyphusProjectPlugin
-import com.github.benmanes.gradle.versions.VersionsPlugin
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaLibraryPlugin
@@ -8,36 +7,51 @@ import org.gradle.api.tasks.testing.Test
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.withType
 import org.gradle.plugins.ide.idea.IdeaPlugin
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 val Project.java: Project
     get() {
         pluginManager.apply(JavaLibraryPlugin::class.java)
         pluginManager.apply(SisyphusProjectPlugin::class.java)
 
-        managedDependencies
-
         tasks.withType<JavaCompile> {
             sourceCompatibility = JavaVersion.VERSION_1_8.majorVersion
             targetCompatibility = JavaVersion.VERSION_1_8.majorVersion
         }
         return this
     }
 
+val Project.kotlin: Project
+    get() {
+        apply {
+            plugin("kotlin")
+            plugin("kotlin-spring")
+            plugin("org.jlleitschuh.gradle.ktlint")
+        }
+
+        dependencies {
+            add("api", "org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+            add("implementation", "org.jetbrains.kotlin:kotlin-reflect")
+        }
+
+        tasks.withType<KotlinCompile> {
+            kotlinOptions.jvmTarget = "1.8"
+            kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+        }
+
+        return this
+    }
+
 val Project.next: Project
     get() {
         pluginManager.apply(IdeaPlugin::class.java)
-        pluginManager.apply(VersionsPlugin::class.java)
 
-        java.kotlin.managedDependencies
+        java.kotlin
 
         tasks.withType<Test> {
             useJUnitPlatform()
         }
 
-        tasks.withType<JavaCompile> {
-            sourceCompatibility = JavaVersion.VERSION_1_8.majorVersion
-            targetCompatibility = JavaVersion.VERSION_1_8.majorVersion
-        }
         return this
     }
 
@@ -46,10 +60,6 @@ val Project.middleware: Project
         next
 
         group = "com.bybutter.sisyphus.middleware"
-
-        dependencies {
-            "api"(Dependencies.Spring.Boot.boot)
-        }
         return this
     }
 
@@ -61,28 +71,11 @@ val Project.lib: Project
         return this
     }
 
-val Project.proto: Project
-    get() {
-        java
-
-        group = "com.bybutter.sisyphus.proto"
-
-        pluginManager.apply(JavaLibraryPlugin::class.java)
-        pluginManager.apply(SisyphusProjectPlugin::class.java)
-
-        return this
-    }
-
 val Project.starter: Project
     get() {
         next
 
         group = "com.bybutter.sisyphus.starter"
-
-        dependencies {
-            "api"(Dependencies.Spring.Boot.boot)
-            "testImplementation"(Dependencies.Spring.Boot.test)
-        }
         return this
     }