Skip to content

Commit

Permalink
fix: small fixes (#976)
Browse files Browse the repository at this point in the history
  • Loading branch information
worstell authored Feb 23, 2024
1 parent 459b441 commit 288a9cd
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dev: install-jars

# Install all JARs to local Maven repository and local build directory
install-jars:
bit 'build/**/*.jar'
bit 'kotlin-runtime/**/*.jar'

# Deploy the Go time module
deploy-time:
Expand Down
4 changes: 2 additions & 2 deletions buildengine/deps.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func extractKotlinFTLImports(self, dir string) ([]string, error) {
dependencies := map[string]bool{}
kotlinImportRegex := regexp.MustCompile(`^import ftl\.([A-Za-z0-9_.]+)`)

err := filepath.WalkDir(dir, func(path string, d fs.DirEntry, err error) error {
err := filepath.WalkDir(filepath.Join(dir, "src/main/kotlin"), func(path string, d fs.DirEntry, err error) error {
if err != nil {
return err
}
Expand Down Expand Up @@ -127,7 +127,7 @@ func extractKotlinFTLImports(self, dir string) ([]string, error) {
})

if err != nil {
return nil, fmt.Errorf("%s: failed to extract dependencies from Go module: %w", self, err)
return nil, fmt.Errorf("%s: failed to extract dependencies from Kotlin module: %w", self, err)
}
modules := maps.Keys(dependencies)
sort.Strings(modules)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ftl.echo
package ftl.alpha

import ftl.builtin.Empty
import ftl.other.Other
Expand Down

0 comments on commit 288a9cd

Please sign in to comment.