chore: examples to kotlin 2.0.0 (#240)

flock-community · Jul 19, 2024 · c553ff5 · c553ff5
1 parent af8c1a4
commit c553ff5
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 9 deletions.
diff --git a/examples/spring-boot-custom-maven-plugin/Makefile b/examples/spring-boot-custom-maven-plugin/Makefile
@@ -0,0 +1,4 @@
+.PHONY: *
+
+build:
+	./mvnw clean package
diff --git a/examples/spring-boot-maven-plugin/Makefile b/examples/spring-boot-maven-plugin/Makefile
@@ -0,0 +1,4 @@
+.PHONY: *
+
+build:
+	./mvnw clean package
diff --git a/examples/spring-boot-openapi-maven-plugin/Makefile b/examples/spring-boot-openapi-maven-plugin/Makefile
@@ -0,0 +1,4 @@
+.PHONY: *
+
+build:
+	./mvnw clean package
diff --git a/examples/spring-boot-openapi-maven-plugin/pom.xml b/examples/spring-boot-openapi-maven-plugin/pom.xml
@@ -14,7 +14,7 @@
     <description>Demo project for Wirespec</description>
     <properties>
         <java.version>17</java.version>
-        <kotlin.version>1.9.24</kotlin.version>
+        <kotlin.version>2.0.0</kotlin.version>
     </properties>
     <dependencies>
         <dependency>

diff --git a/examples/wirespec-gradle-plugin-ktor/.gitignore b/examples/wirespec-gradle-plugin-ktor/.gitignore
@@ -1,4 +1,5 @@
-.gradle
+.gradle/
+.kotlin/
 build/
 !**/src/main/**/build/
 !**/src/test/**/build/
@@ -32,4 +33,4 @@ out/
 /.nb-gradle/
 
 ### VS Code ###
-.vscode/
+.vscode/
diff --git a/examples/wirespec-gradle-plugin-ktor/Makefile b/examples/wirespec-gradle-plugin-ktor/Makefile
@@ -0,0 +1,4 @@
+.PHONY: *
+
+build:
+	./gradlew clean build
diff --git a/examples/wirespec-gradle-plugin-ktor/build.gradle.kts b/examples/wirespec-gradle-plugin-ktor/build.gradle.kts
@@ -16,7 +16,7 @@ val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
-    kotlin("jvm") version "1.9.24"
+    kotlin("jvm") version "2.0.0"
     kotlin("plugin.serialization") version "2.0.0-RC3"
     id("io.ktor.plugin") version "2.3.9"
     id("community.flock.wirespec.plugin.gradle") version "0.0.0-SNAPSHOT"

diff --git a/examples/wirespec-gradle-plugin-ktor/gradle.properties b/examples/wirespec-gradle-plugin-ktor/gradle.properties
@@ -1,4 +1,4 @@
 ktor_version=2.3.9
-kotlin_version=1.9.24
+kotlin_version=2.0.0
 logback_version=1.4.14
 kotlin.code.style=official
diff --git a/scripts/example.sh b/scripts/example.sh
@@ -6,7 +6,7 @@ dir="$(dirname -- "$0")"
 ./gradlew src:plugin:gradle:publishToMavenLocal &&
   ./gradlew src:plugin:maven:publishToMavenLocal &&
   # build examples
-  (cd "$dir"/../examples/wirespec-gradle-plugin-ktor && ./gradlew clean build) &&
-  (cd "$dir"/../examples/spring-boot-maven-plugin && ./mvnw clean package) &&
-  (cd "$dir"/../examples/spring-boot-custom-maven-plugin && ./mvnw clean package) &&
-  (cd "$dir"/../examples/spring-boot-openapi-maven-plugin && ./mvnw clean package)
+  (cd "$dir"/../examples/wirespec-gradle-plugin-ktor && make build) &&
+  (cd "$dir"/../examples/spring-boot-maven-plugin && make build) &&
+  (cd "$dir"/../examples/spring-boot-custom-maven-plugin &&  make build) &&
+  (cd "$dir"/../examples/spring-boot-openapi-maven-plugin && make build)