fix rebase

block · Mar 21, 2024 · 545c008 · 545c008
1 parent c279d52
commit 545c008
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/buildengine/discover_test.go b/buildengine/discover_test.go
@@ -63,7 +63,7 @@ func TestDiscoverModules(t *testing.T) {
 		},
 		Module{
 			ModuleConfig: moduleconfig.ModuleConfig{
-				Dir:      "testdata/modules/external",
+				Dir:      "testdata/projects/external",
 				Language: "go",
 				Realm:    "home",
 				Module:   "external",
@@ -82,19 +82,7 @@ func TestDiscoverModules(t *testing.T) {
 		},
 		Module{
 			ModuleConfig: moduleconfig.ModuleConfig{
-				Dir:       "testdata/projects/other",
-				Language:  "go",
-				Realm:     "home",
-				Module:    "other",
-				Deploy:    []string{"main"},
-				DeployDir: "_ftl",
-				Schema:    "schema.pb",
-				Watch:     []string{"**/*.go", "go.mod", "go.sum"},
-			},
-		},
-		Module{
-			ModuleConfig: moduleconfig.ModuleConfig{
-				Dir:      "testdata/modules/externalkotlin",
+				Dir:      "testdata/projects/externalkotlin",
 				Language: "kotlin",
 				Realm:    "home",
 				Module:   "externalkotlin",
@@ -114,6 +102,18 @@ func TestDiscoverModules(t *testing.T) {
 				},
 			},
 		},
+		Module{
+			ModuleConfig: moduleconfig.ModuleConfig{
+				Dir:       "testdata/projects/other",
+				Language:  "go",
+				Realm:     "home",
+				Module:    "other",
+				Deploy:    []string{"main"},
+				DeployDir: "_ftl",
+				Schema:    "schema.pb",
+				Watch:     []string{"**/*.go", "go.mod", "go.sum"},
+			},
+		},
 		ExternalLibrary{
 			Dir:      "testdata/projects/lib",
 			Language: "go",

diff --git a/...ine/testdata/modules/external/external.go → ...ne/testdata/projects/external/external.go b/...ine/testdata/modules/external/external.go → ...ne/testdata/projects/external/external.go
diff --git a/...engine/testdata/modules/external/ftl.toml → ...ngine/testdata/projects/external/ftl.toml b/...engine/testdata/modules/external/ftl.toml → ...ngine/testdata/projects/external/ftl.toml
diff --git a/buildengine/testdata/modules/external/go.mod → ...dengine/testdata/projects/external/go.mod b/buildengine/testdata/modules/external/go.mod → ...dengine/testdata/projects/external/go.mod
diff --git a/buildengine/testdata/modules/external/go.sum → ...dengine/testdata/projects/external/go.sum b/buildengine/testdata/modules/external/go.sum → ...dengine/testdata/projects/external/go.sum
diff --git a/.../testdata/modules/externalkotlin/ftl.toml → ...testdata/projects/externalkotlin/ftl.toml b/.../testdata/modules/externalkotlin/ftl.toml → ...testdata/projects/externalkotlin/ftl.toml
diff --git a/...e/testdata/modules/externalkotlin/pom.xml → .../testdata/projects/externalkotlin/pom.xml b/...e/testdata/modules/externalkotlin/pom.xml → .../testdata/projects/externalkotlin/pom.xml
diff --git a/...tlin/ftl/externalkotlin/ExternalKotlin.kt → ...tlin/ftl/externalkotlin/ExternalKotlin.kt b/...tlin/ftl/externalkotlin/ExternalKotlin.kt → ...tlin/ftl/externalkotlin/ExternalKotlin.kt