diff --git a/.mvn/maven.config b/.mvn/maven.config
deleted file mode 100644
index e89445621b..0000000000
--- a/.mvn/maven.config
+++ /dev/null
@@ -1 +0,0 @@
---also-make
diff --git a/Bitfile b/Bitfile
index 52696b5c73..4c10e23508 100644
--- a/Bitfile
+++ b/Bitfile
@@ -4,7 +4,6 @@ RELEASE = %{DEST}/release
GO_SOURCES = **/*.go
-
SCHEMA_IN = backend/schema/schema.go backend/schema/protobuf.go \
cmd/ftl/cmd_schema.go
SCHEMA_OUT = protos/xyz/block/ftl/v1/schema/schema.proto
@@ -25,7 +24,8 @@ COMMON_LOG_IN = backend/common/log/api.go
COMMON_LOG_OUT = backend/common/log/log_level_string.go
KT_RUNTIME_IN = kotlin-runtime/ftl-runtime/**/*.{kt,kts} pom.xml kotlin-runtime/**/pom.xml
-KT_RUNTIME_OUT = kotlin-runtime/ftl-runtime/target/ftl-runtime-1.0-SNAPSHOT-jar-with-dependencies.jar
+KT_MVN_OUT = kotlin-runtime/ftl-runtime/target/ftl-runtime-1.0-SNAPSHOT-jar-with-dependencies.jar
+KT_RUNTIME_OUT = build/template/ftl/jars/ftl-runtime.jar
CLIENT_OUT = console/client/dist/index.html
CLIENT_IN = console/client/**/*
@@ -45,7 +45,9 @@ implicit %{RELEASE}/%{1}: cmd/*
# build: go build -o %{OUT} -tags release -ldflags "-X main.version=%{VERSION}" ./cmd/ftl-controller
%{SCHEMA_OUT}: %{SCHEMA_IN}
- build: ftl-schema > %{OUT}
+ build:
+ ftl-schema > %{OUT}
+ buf format -w
%{PROTO_OUT}: %{PROTO_IN}
build:
@@ -55,15 +57,15 @@ implicit %{RELEASE}/%{1}: cmd/*
(cd backend/common/3rdparty/protos && buf generate)
-clean
-%{KT_RUNTIME_OUT}: %{KT_RUNTIME_IN} %{PROTO_IN}
- build: mvn -pl kotlin-runtime/ftl-runtime install
- +clean: mvn -pl kotlin-runtime/ftl-runtime clean
+%{KT_MVN_OUT}: %{KT_RUNTIME_IN} %{PROTO_IN}
+ build: mvn -pl :ftl-runtime package
+ +clean: mvn -pl :ftl-runtime clean
-build/template/ftl/jars:
+%(dirname %{KT_RUNTIME_OUT})%:
build: install -m 0700 -d %{OUT}
-build/template/ftl/jars/ftl-runtime.jar: %{KT_RUNTIME_OUT} build/template/ftl/jars
- build: install -m 0600 %{KT_RUNTIME_OUT} %{OUT}
+%{KT_RUNTIME_OUT}: %{KT_MVN_OUT} %(dirname %{KT_RUNTIME_OUT})%
+ build: install -m 0600 %{KT_MVN_OUT} %{OUT}
%{COMMON_LOG_OUT}: %{COMMON_LOG_IN}
build: go generate %{IN}
diff --git a/Makefile b/Makefile
index febff78775..ffef800648 100644
--- a/Makefile
+++ b/Makefile
@@ -63,8 +63,6 @@ $(KT_RUNTIME_OUT): $(KT_MVN_OUT)
mkdir -p build/template/ftl/jars
cp $< $@
-
-
console/client/dist/index.html:
cd console/client && npm install && npm run build
diff --git a/examples/echo-kotlin/pom.xml b/examples/echo-kotlin/pom.xml
index bb05b0aaa2..4598c13cd9 100644
--- a/examples/echo-kotlin/pom.xml
+++ b/examples/echo-kotlin/pom.xml
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- xyz.block.ftl
+ xyz.block
echo-kotlin
1.0-SNAPSHOT
diff --git a/kotlin-runtime/ftl-generator/pom.xml b/kotlin-runtime/ftl-generator/pom.xml
index 672a2d0271..554487dfb5 100644
--- a/kotlin-runtime/ftl-generator/pom.xml
+++ b/kotlin-runtime/ftl-generator/pom.xml
@@ -5,7 +5,7 @@
4.0.0
- xyz.block.ftl
+ xyz.block
ftl
1.0-SNAPSHOT
../../pom.xml
diff --git a/kotlin-runtime/ftl-runtime/pom.xml b/kotlin-runtime/ftl-runtime/pom.xml
index ff1f8da647..9a081444c6 100644
--- a/kotlin-runtime/ftl-runtime/pom.xml
+++ b/kotlin-runtime/ftl-runtime/pom.xml
@@ -5,7 +5,7 @@
4.0.0
- xyz.block.ftl
+ xyz.block
ftl
1.0-SNAPSHOT
../../pom.xml
@@ -49,6 +49,10 @@
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
org.apache.maven.plugins
maven-assembly-plugin
@@ -74,10 +78,6 @@
kotlin-maven-plugin
org.jetbrains.kotlin
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
org.apache.maven.plugins
@@ -88,10 +88,6 @@
org.codehaus.mojo
exec-maven-plugin
-
- org.codehaus.mojo
- build-helper-maven-plugin
-
diff --git a/pom.xml b/pom.xml
index 5792ef1fae..79f0d0c8f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
- xyz.block.ftl
+ xyz.block
ftl
1.0-SNAPSHOT
pom
@@ -19,7 +19,6 @@
${basedir}
11
1.9.0
- true
4.8.1
1.56.1
1.4.5
@@ -118,6 +117,24 @@
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ 3.2.0
+
+
+ generate-sources
+
+ add-source
+
+
+
+
+
+
+
+
+
org.apache.maven.plugins
maven-surefire-plugin
@@ -158,39 +175,6 @@
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.10.1
-
-
- ${java.version}
-
-
-
- default-compile
- none
-
-
- default-testCompile
- none
-
-
- java-compile
- compile
-
- compile
-
-
-
- java-test-compile
- test-compile
-
- testCompile
-
-
-
-
org.apache.maven.plugins
@@ -261,24 +245,6 @@
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 3.2.0
-
-
- generate-sources
-
- add-source
-
-
-
-
-
-
-
-
-