Update kotlin template

ehyland · Apr 15, 2023 · 339014a · 339014a
1 parent 15811d7
commit 339014a
Show file tree

Hide file tree

Showing 41 changed files with 151 additions and 94 deletions.
diff --git a/kotlin/app/build.gradle.kts b/kotlin/app/build.gradle.kts
@@ -1,13 +1,12 @@
+
 /*
  * This file was generated by the Gradle 'init' task.
  */
 
-plugins {
-    id("example.kotlin-application-conventions")
-}
-
 dependencies {
-    implementation("org.apache.commons:commons-text")
+    implementation(platform(Dependencies.wireBom))
+    implementation(Dependencies.wireSchema)
+    implementation(Dependencies.kotlinxSerializationJson)
 }
 
 application {

diff --git a/kotlin/app/src/main/kotlin/example/app/App.kt b/kotlin/app/src/main/kotlin/example/app/App.kt
@@ -1,5 +1,32 @@
 package example.app
 
+import com.squareup.wire.schema.Location
+import com.squareup.wire.schema.MessageType
+import com.squareup.wire.schema.Schema
+import com.squareup.wire.schema.SchemaLoader
+import java.io.File
+import java.nio.file.FileSystems
+
 fun main() {
-    println("Yay!")
+    val schema = schema()
+    schema.protoFiles[0].types.forEach { type ->
+        val message = type as MessageType
+        println("message ${message.name} {")
+        message.declaredFields.forEach { field ->
+            var labels = ""
+            if (!field.isRequired && !field.isRepeated) labels += "optional "
+            if (field.isRepeated) labels += "repeated "
+
+            println("  ${labels}${field.type} ${field.name} = ${field.tag};")
+        }
+        println("}")
+    }
 }
+
+private fun schema(): Schema {
+    val schemaLoader = SchemaLoader(FileSystems.getDefault())
+    val root = File("app/src/main/proto").absolutePath
+    println(root)
+    schemaLoader.initRoots(listOf(Location.get(root)))
+    return schemaLoader.loadSchema()
+}
diff --git a/kotlin/app/src/main/proto/api.proto b/kotlin/app/src/main/proto/api.proto
@@ -0,0 +1,23 @@
+syntax = "proto2";
+
+package squareup.wire.sample;
+
+message SampleMessage {
+  repeated string array = 1;
+}
+
+message SampleRequest {
+  optional string name = 1;
+  optional SampleMessage sample_message = 2;
+}
+
+message SampleResponse {
+  optional int32 age = 1;
+}
+
+// This is it. A really fantastic service interface.
+service SampleApi {
+  // Call this RPC. You'll be glad you did!
+  rpc FirstRpc (SampleRequest) returns (SampleResponse);
+  rpc OtherOne (SampleRequest) returns (SampleResponse);
+}
diff --git a/kotlin/bin/.corretto-17.0.6.10.1.pkg → kotlin/bin/[email protected] b/kotlin/bin/.corretto-17.0.6.10.1.pkg → kotlin/bin/[email protected]
diff --git a/kotlin/bin/.gradle-7.6.pkg → kotlin/bin/[email protected] b/kotlin/bin/.gradle-7.6.pkg → kotlin/bin/[email protected]
diff --git a/kotlin/bin/gradle b/kotlin/bin/gradle
@@ -1 +1 @@
-.gradle-7.6.pkg
+.gradle@latest.pkg
diff --git a/kotlin/bin/jar b/kotlin/bin/jar
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jarsigner b/kotlin/bin/jarsigner
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/java b/kotlin/bin/java
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/javac b/kotlin/bin/javac
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/javadoc b/kotlin/bin/javadoc
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/javap b/kotlin/bin/javap
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jcmd b/kotlin/bin/jcmd
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jconsole b/kotlin/bin/jconsole
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jdb b/kotlin/bin/jdb
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jdeprscan b/kotlin/bin/jdeprscan
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jdeps b/kotlin/bin/jdeps
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jfr b/kotlin/bin/jfr
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jhsdb b/kotlin/bin/jhsdb
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jimage b/kotlin/bin/jimage
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jinfo b/kotlin/bin/jinfo
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jlink b/kotlin/bin/jlink
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jmap b/kotlin/bin/jmap
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jmod b/kotlin/bin/jmod
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jpackage b/kotlin/bin/jpackage
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jps b/kotlin/bin/jps
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jrunscript b/kotlin/bin/jrunscript
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jshell b/kotlin/bin/jshell
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jstack b/kotlin/bin/jstack
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jstat b/kotlin/bin/jstat
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/jstatd b/kotlin/bin/jstatd
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/keytool b/kotlin/bin/keytool
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/rmiregistry b/kotlin/bin/rmiregistry
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/bin/serialver b/kotlin/bin/serialver
@@ -1 +1 @@
-.corretto-17.0.6.10.1.pkg
+.corretto@latest.pkg
diff --git a/kotlin/build.gradle.kts b/kotlin/build.gradle.kts
@@ -0,0 +1,41 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+repositories {
+    mavenCentral()
+    gradlePluginPortal()
+}
+
+plugins {
+    kotlin("jvm").version(Dependencies.kotlinVersion)
+    kotlin("plugin.serialization").version(Dependencies.kotlinVersion)
+}
+
+subprojects {
+    apply(plugin = "org.jetbrains.kotlin.jvm")
+    apply(plugin = "org.jetbrains.kotlin.plugin.serialization")
+    apply(plugin = "application")
+
+
+    repositories {
+        // Use Maven Central for resolving dependencies.
+        mavenCentral()
+    }
+
+    tasks.withType<JavaCompile> {
+        sourceCompatibility = JavaVersion.VERSION_17.toString()
+        targetCompatibility = JavaVersion.VERSION_17.toString()
+    }
+
+    tasks.withType<KotlinCompile> {
+        kotlinOptions {
+            freeCompilerArgs = listOf("-Xjsr305=strict")
+            jvmTarget = JavaVersion.VERSION_17.toString()
+        }
+    }
+
+    tasks.named<Test>("test") {
+        // Use JUnit Platform for unit tests.
+        useJUnitPlatform()
+        environment("ENVIRONMENT", "test")
+    }
+}
diff --git a/kotlin/buildSrc/build.gradle.kts b/kotlin/buildSrc/build.gradle.kts
@@ -1,17 +1,26 @@
 /*
  * This file was generated by the Gradle 'init' task.
  */
+//
+//plugins {
+//    // Support convention plugins written in Kotlin. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build.
+//    `kotlin-dsl`
+//}
+//
+//repositories {
+//    // Use the plugin portal to apply community plugins in convention plugins.
+//    gradlePluginPortal()
+//}
+//
+//dependencies {
+//    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
+//}
 
 plugins {
-    // Support convention plugins written in Kotlin. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build.
     `kotlin-dsl`
 }
 
 repositories {
-    // Use the plugin portal to apply community plugins in convention plugins.
-    gradlePluginPortal()
-}
-
-dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
-}
+    // Use Maven Central for resolving dependencies.
+    mavenCentral()
+}
diff --git a/kotlin/buildSrc/settings.gradle.kts b/kotlin/buildSrc/settings.gradle.kts
@@ -4,4 +4,4 @@
  * This settings file is used to specify which projects to include in your build-logic build.
  */
 
-rootProject.name = "buildSrc"
+//rootProject.name = "buildSrc"
diff --git a/kotlin/buildSrc/src/main/kotlin/Dependencies.kt b/kotlin/buildSrc/src/main/kotlin/Dependencies.kt
@@ -0,0 +1,8 @@
+object Dependencies {
+    const val kotlinVersion ="1.8.20"
+    const val wireBom = "com.squareup.wire:wire-bom:4.5.5"
+    const val wireSchema = "com.squareup.wire:wire-schema:"
+    const val kotlinxSerializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0"
+
+}
+
diff --git a/kotlin/buildSrc/src/main/kotlin/example.kotlin-application-conventions.gradle.kts b/kotlin/buildSrc/src/main/kotlin/example.kotlin-application-conventions.gradle.kts
diff --git a/kotlin/buildSrc/src/main/kotlin/example.kotlin-common-conventions.gradle.kts b/kotlin/buildSrc/src/main/kotlin/example.kotlin-common-conventions.gradle.kts
diff --git a/kotlin/buildSrc/src/main/kotlin/example.kotlin-library-conventions.gradle.kts b/kotlin/buildSrc/src/main/kotlin/example.kotlin-library-conventions.gradle.kts