diff --git a/cmd/build/ci_output.go b/cmd/build/ci_output.go index 4ab2c51..45285b6 100644 --- a/cmd/build/ci_output.go +++ b/cmd/build/ci_output.go @@ -4,7 +4,7 @@ import ( "strings" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/cli/pkg/cli" + "dappco.re/go/cli/pkg/cli" ) func emitCIErrorAnnotation(err error) { diff --git a/cmd/build/cmd_apple.go b/cmd/build/cmd_apple.go index a24286c..12c5a47 100644 --- a/cmd/build/cmd_apple.go +++ b/cmd/build/cmd_apple.go @@ -8,10 +8,10 @@ import ( "dappco.re/go/build/internal/cmdutil" "dappco.re/go/build/pkg/build" "dappco.re/go/core" - "dappco.re/go/core/cli/pkg/cli" - "dappco.re/go/core/i18n" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/cli/pkg/cli" + "dappco.re/go/i18n" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) var buildAppleFn = build.BuildApple diff --git a/cmd/build/cmd_build.go b/cmd/build/cmd_build.go index b57cbcc..7051453 100644 --- a/cmd/build/cmd_build.go +++ b/cmd/build/cmd_build.go @@ -7,7 +7,7 @@ import ( "dappco.re/go/build/internal/cmdutil" _ "dappco.re/go/build/locales" // registers locale translations "dappco.re/go/core" - "dappco.re/go/core/cli/pkg/cli" + "dappco.re/go/cli/pkg/cli" ) // Style aliases used by build command output. diff --git a/cmd/build/cmd_image.go b/cmd/build/cmd_image.go index 8a663e6..502b3f0 100644 --- a/cmd/build/cmd_image.go +++ b/cmd/build/cmd_image.go @@ -15,9 +15,9 @@ import ( "dappco.re/go/build/pkg/build" "dappco.re/go/build/pkg/build/builders" "dappco.re/go/core" - "dappco.re/go/core/cli/pkg/cli" - coreio "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/cli/pkg/cli" + coreio "dappco.re/go/io" + coreerr "dappco.re/go/log" ) type immutableImageVersion struct { diff --git a/cmd/build/cmd_image_test.go b/cmd/build/cmd_image_test.go index 9dec845..6bb7d91 100644 --- a/cmd/build/cmd_image_test.go +++ b/cmd/build/cmd_image_test.go @@ -9,7 +9,7 @@ import ( "dappco.re/go/build/pkg/build" "dappco.re/go/build/pkg/build/builders" "dappco.re/go/core" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func setupFakeLinuxKitImageCLI(t *testing.T, binDir string) { diff --git a/cmd/build/cmd_installers.go b/cmd/build/cmd_installers.go index 5688de9..a256e52 100644 --- a/cmd/build/cmd_installers.go +++ b/cmd/build/cmd_installers.go @@ -11,9 +11,9 @@ import ( "dappco.re/go/build/pkg/release" "dappco.re/go/build/pkg/release/publishers" "dappco.re/go/core" - "dappco.re/go/core/cli/pkg/cli" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/cli/pkg/cli" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) var ( diff --git a/cmd/build/cmd_installers_test.go b/cmd/build/cmd_installers_test.go index 6b30582..51f27ee 100644 --- a/cmd/build/cmd_installers_test.go +++ b/cmd/build/cmd_installers_test.go @@ -8,7 +8,7 @@ import ( "dappco.re/go/build/pkg/build" "dappco.re/go/build/pkg/release" "dappco.re/go/core" - "dappco.re/go/core/io" + "dappco.re/go/io" "errors" "os" ) diff --git a/cmd/build/cmd_project.go b/cmd/build/cmd_project.go index 5ac0191..b70c7ea 100644 --- a/cmd/build/cmd_project.go +++ b/cmd/build/cmd_project.go @@ -19,10 +19,10 @@ import ( "dappco.re/go/build/pkg/build/signing" "dappco.re/go/build/pkg/release" "dappco.re/go/core" - "dappco.re/go/core/cli/pkg/cli" - "dappco.re/go/core/i18n" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/cli/pkg/cli" + "dappco.re/go/i18n" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) var getProjectBuildWorkingDir = ax.Getwd diff --git a/cmd/build/cmd_project_test.go b/cmd/build/cmd_project_test.go index b475da8..84fdbb9 100644 --- a/cmd/build/cmd_project_test.go +++ b/cmd/build/cmd_project_test.go @@ -10,8 +10,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/cli/pkg/cli" - "dappco.re/go/core/io" + "dappco.re/go/cli/pkg/cli" + "dappco.re/go/io" "errors" ) diff --git a/cmd/build/cmd_pwa.go b/cmd/build/cmd_pwa.go index dd15edb..c7dbef4 100644 --- a/cmd/build/cmd_pwa.go +++ b/cmd/build/cmd_pwa.go @@ -18,8 +18,8 @@ import ( "dappco.re/go/core" "dappco.re/go/build/internal/ax" - "dappco.re/go/core/i18n" - coreerr "dappco.re/go/core/log" + "dappco.re/go/i18n" + coreerr "dappco.re/go/log" "github.com/leaanthony/debme" "github.com/leaanthony/gosod" "golang.org/x/net/html" diff --git a/cmd/build/cmd_release.go b/cmd/build/cmd_release.go index cda4257..cf62bf8 100644 --- a/cmd/build/cmd_release.go +++ b/cmd/build/cmd_release.go @@ -9,9 +9,9 @@ import ( "dappco.re/go/build/internal/cmdutil" "dappco.re/go/build/pkg/release" "dappco.re/go/core" - "dappco.re/go/core/cli/pkg/cli" - "dappco.re/go/core/i18n" - coreerr "dappco.re/go/core/log" + "dappco.re/go/cli/pkg/cli" + "dappco.re/go/i18n" + coreerr "dappco.re/go/log" ) var ( diff --git a/cmd/build/cmd_release_test.go b/cmd/build/cmd_release_test.go index 02534fb..48d1741 100644 --- a/cmd/build/cmd_release_test.go +++ b/cmd/build/cmd_release_test.go @@ -7,7 +7,7 @@ import ( "dappco.re/go/build/pkg/release" "dappco.re/go/core" - "dappco.re/go/core/cli/pkg/cli" + "dappco.re/go/cli/pkg/cli" ) func TestBuildCmd_applyReleaseArchiveFormatOverride_Good(t *testing.T) { diff --git a/cmd/build/cmd_sdk.go b/cmd/build/cmd_sdk.go index 4028aa8..c29e0b1 100644 --- a/cmd/build/cmd_sdk.go +++ b/cmd/build/cmd_sdk.go @@ -12,10 +12,10 @@ import ( "dappco.re/go/build/internal/sdkcfg" "dappco.re/go/build/pkg/sdk" "dappco.re/go/core" - "dappco.re/go/core/cli/pkg/cli" - "dappco.re/go/core/i18n" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/cli/pkg/cli" + "dappco.re/go/i18n" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // runBuildSDK handles the `core build sdk` command. diff --git a/cmd/build/cmd_workflow.go b/cmd/build/cmd_workflow.go index a7e1493..369bd85 100644 --- a/cmd/build/cmd_workflow.go +++ b/cmd/build/cmd_workflow.go @@ -9,8 +9,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/internal/cmdutil" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // releaseWorkflowRequestInputs keeps the workflow alias inputs grouped by the diff --git a/cmd/build/cmd_workflow_test.go b/cmd/build/cmd_workflow_test.go index 8afc8ea..5e7376c 100644 --- a/cmd/build/cmd_workflow_test.go +++ b/cmd/build/cmd_workflow_test.go @@ -6,7 +6,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" "dappco.re/go/core" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestBuildCmd_resolveReleaseWorkflowOutputPathInput_Good(t *testing.T) { diff --git a/cmd/ci/ci.go b/cmd/ci/ci.go index cede509..41d9d40 100644 --- a/cmd/ci/ci.go +++ b/cmd/ci/ci.go @@ -7,9 +7,9 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/internal/cmdutil" "dappco.re/go/build/pkg/release" - "dappco.re/go/core/cli/pkg/cli" - "dappco.re/go/core/i18n" - coreerr "dappco.re/go/core/log" + "dappco.re/go/cli/pkg/cli" + "dappco.re/go/i18n" + coreerr "dappco.re/go/log" ) // Style aliases used by CI command output. diff --git a/cmd/sdk/cmd.go b/cmd/sdk/cmd.go index f7a1e00..da4c940 100644 --- a/cmd/sdk/cmd.go +++ b/cmd/sdk/cmd.go @@ -16,10 +16,10 @@ import ( "dappco.re/go/build/internal/sdkcfg" "dappco.re/go/build/pkg/sdk" "dappco.re/go/core" - "dappco.re/go/core/cli/pkg/cli" - "dappco.re/go/core/i18n" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/cli/pkg/cli" + "dappco.re/go/i18n" + "dappco.re/go/io" + coreerr "dappco.re/go/log" "github.com/oasdiff/oasdiff/checker" ) diff --git a/cmd/sdk/cmd_test.go b/cmd/sdk/cmd_test.go index a6c6331..7c6d783 100644 --- a/cmd/sdk/cmd_test.go +++ b/cmd/sdk/cmd_test.go @@ -7,7 +7,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/core" - "dappco.re/go/core/cli/pkg/cli" + "dappco.re/go/cli/pkg/cli" ) const validOpenAPISpec = `openapi: "3.0.0" diff --git a/cmd/service/cmd.go b/cmd/service/cmd.go index f0ac84c..1afacc0 100644 --- a/cmd/service/cmd.go +++ b/cmd/service/cmd.go @@ -14,8 +14,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/internal/cmdutil" buildservice "dappco.re/go/build/pkg/service" - "dappco.re/go/core/cli/pkg/cli" - coreerr "dappco.re/go/core/log" + "dappco.re/go/cli/pkg/cli" + coreerr "dappco.re/go/log" ) var ( diff --git a/go.mod b/go.mod index 72a64ae..eafeefc 100644 --- a/go.mod +++ b/go.mod @@ -4,13 +4,13 @@ go 1.26.0 require ( dappco.re/go/core v0.8.0-alpha.1 - dappco.re/go/core/api v0.3.0 - dappco.re/go/core/cli v0.5.2 - dappco.re/go/core/i18n v0.2.3 - dappco.re/go/core/io v0.4.1 - dappco.re/go/core/log v0.1.2 - dappco.re/go/core/process v0.5.1 - dappco.re/go/core/ws v0.4.0 + dappco.re/go/api v0.3.0 + dappco.re/go/cli v0.5.2 + dappco.re/go/i18n v0.2.3 + dappco.re/go/io v0.4.1 + dappco.re/go/log v0.1.2 + dappco.re/go/process v0.5.1 + dappco.re/go/ws v0.4.0 github.com/Snider/Borg v0.2.0 github.com/gin-gonic/gin v1.12.0 github.com/gorilla/websocket v1.5.3 @@ -26,7 +26,7 @@ require ( require ( cloud.google.com/go v0.123.0 // indirect - dappco.re/go/core/inference v0.3.0 // indirect + dappco.re/go/inference v0.3.0 // indirect github.com/99designs/gqlgen v0.17.88 // indirect github.com/KyleBanks/depth v1.2.1 // indirect github.com/TwiN/go-color v1.4.1 // indirect diff --git a/internal/ax/ax.go b/internal/ax/ax.go index 24287a5..4dce9aa 100644 --- a/internal/ax/ax.go +++ b/internal/ax/ax.go @@ -8,10 +8,10 @@ import ( "syscall" "dappco.re/go/core" - coreio "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" - process "dappco.re/go/core/process" - processexec "dappco.re/go/core/process/exec" + coreio "dappco.re/go/io" + coreerr "dappco.re/go/log" + process "dappco.re/go/process" + processexec "dappco.re/go/process/exec" ) // DS returns the current platform directory separator. diff --git a/internal/cmdutil/cmdutil.go b/internal/cmdutil/cmdutil.go index 6b3b670..671251e 100644 --- a/internal/cmdutil/cmdutil.go +++ b/internal/cmdutil/cmdutil.go @@ -5,7 +5,7 @@ import ( "strconv" "dappco.re/go/core" - "dappco.re/go/core/cli/pkg/cli" + "dappco.re/go/cli/pkg/cli" ) // ContextOrBackground returns the active CLI context when available. diff --git a/internal/projectdetect/projectdetect.go b/internal/projectdetect/projectdetect.go index da5e6c1..d3bb98c 100644 --- a/internal/projectdetect/projectdetect.go +++ b/internal/projectdetect/projectdetect.go @@ -3,7 +3,7 @@ package projectdetect import ( "dappco.re/go/build/pkg/build" "dappco.re/go/build/pkg/build/builders" - "dappco.re/go/core/io" + "dappco.re/go/io" ) type detector struct { diff --git a/internal/projectdetect/projectdetect_test.go b/internal/projectdetect/projectdetect_test.go index bc662b5..4ed5244 100644 --- a/internal/projectdetect/projectdetect_test.go +++ b/internal/projectdetect/projectdetect_test.go @@ -5,7 +5,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestDetectProjectType_Good(t *testing.T) { diff --git a/internal/sdkcfg/sdkcfg.go b/internal/sdkcfg/sdkcfg.go index aed4e93..54438a7 100644 --- a/internal/sdkcfg/sdkcfg.go +++ b/internal/sdkcfg/sdkcfg.go @@ -4,7 +4,7 @@ import ( "dappco.re/go/build/pkg/build" "dappco.re/go/build/pkg/release" "dappco.re/go/build/pkg/sdk" - "dappco.re/go/core/io" + "dappco.re/go/io" ) // LoadProjectConfig resolves SDK settings from build config first, then falls diff --git a/internal/sdkcfg/sdkcfg_test.go b/internal/sdkcfg/sdkcfg_test.go index 880460a..456f922 100644 --- a/internal/sdkcfg/sdkcfg_test.go +++ b/internal/sdkcfg/sdkcfg_test.go @@ -6,7 +6,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" "dappco.re/go/build/pkg/release" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestLoadProjectConfig_Good(t *testing.T) { diff --git a/locales/embed.go b/locales/embed.go index 98b854b..2cb5074 100644 --- a/locales/embed.go +++ b/locales/embed.go @@ -4,7 +4,7 @@ package locales import ( "embed" - "dappco.re/go/core/i18n" + "dappco.re/go/i18n" ) // Usage example: use locales.FS from package consumers as needed. diff --git a/pkg/api/provider.go b/pkg/api/provider.go index 635f4b4..557893d 100644 --- a/pkg/api/provider.go +++ b/pkg/api/provider.go @@ -22,11 +22,11 @@ import ( "dappco.re/go/build/pkg/build/signing" "dappco.re/go/build/pkg/release" "dappco.re/go/build/pkg/sdk" - "dappco.re/go/core/api" - "dappco.re/go/core/api/pkg/provider" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" - "dappco.re/go/core/ws" + "dappco.re/go/api" + "dappco.re/go/api/pkg/provider" + "dappco.re/go/io" + coreerr "dappco.re/go/log" + "dappco.re/go/ws" "github.com/gin-gonic/gin" ) diff --git a/pkg/api/provider_test.go b/pkg/api/provider_test.go index e98baf3..800d63d 100644 --- a/pkg/api/provider_test.go +++ b/pkg/api/provider_test.go @@ -18,9 +18,9 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" "dappco.re/go/build/pkg/release" - coreapi "dappco.re/go/core/api" - "dappco.re/go/core/io" - "dappco.re/go/core/ws" + coreapi "dappco.re/go/api" + "dappco.re/go/io" + "dappco.re/go/ws" "errors" "github.com/gorilla/websocket" ) diff --git a/pkg/build/apple.go b/pkg/build/apple.go index b0dc2b0..030a874 100644 --- a/pkg/build/apple.go +++ b/pkg/build/apple.go @@ -15,8 +15,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) const ( diff --git a/pkg/build/apple/apple.go b/pkg/build/apple/apple.go index 5e54378..d4c6783 100644 --- a/pkg/build/apple/apple.go +++ b/pkg/build/apple/apple.go @@ -8,8 +8,8 @@ import ( "dappco.re/go/build/internal/ax" build "dappco.re/go/build/pkg/build" "dappco.re/go/build/pkg/release" - coreio "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + coreio "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // AppleOptions aliases the core Apple pipeline options. diff --git a/pkg/build/apple/apple_test.go b/pkg/build/apple/apple_test.go index 4dde2d5..1c75512 100644 --- a/pkg/build/apple/apple_test.go +++ b/pkg/build/apple/apple_test.go @@ -10,7 +10,7 @@ import ( build "dappco.re/go/build/pkg/build" "dappco.re/go/build/pkg/build/signing" "dappco.re/go/core" - coreio "dappco.re/go/core/io" + coreio "dappco.re/go/io" ) func TestAppleBuilder_New_Good(t *testing.T) { diff --git a/pkg/build/apple_test.go b/pkg/build/apple_test.go index e72b1ac..6016e60 100644 --- a/pkg/build/apple_test.go +++ b/pkg/build/apple_test.go @@ -6,7 +6,7 @@ import ( "testing" "dappco.re/go/build/internal/ax" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestApple_WriteInfoPlist_Good(t *testing.T) { diff --git a/pkg/build/archive.go b/pkg/build/archive.go index 6ba836c..3ac9d7b 100644 --- a/pkg/build/archive.go +++ b/pkg/build/archive.go @@ -12,8 +12,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/core" - io_interface "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + io_interface "dappco.re/go/io" + coreerr "dappco.re/go/log" "github.com/Snider/Borg/pkg/compress" ) diff --git a/pkg/build/archive_test.go b/pkg/build/archive_test.go index 83b413e..2170c71 100644 --- a/pkg/build/archive_test.go +++ b/pkg/build/archive_test.go @@ -12,7 +12,7 @@ import ( "dappco.re/go/build/internal/ax" - io_interface "dappco.re/go/core/io" + io_interface "dappco.re/go/io" "github.com/Snider/Borg/pkg/compress" "os" ) diff --git a/pkg/build/build.go b/pkg/build/build.go index 07978c6..52add54 100644 --- a/pkg/build/build.go +++ b/pkg/build/build.go @@ -6,7 +6,7 @@ package build import ( "context" - "dappco.re/go/core/io" + "dappco.re/go/io" ) // ProjectType represents a detected project type. diff --git a/pkg/build/builders/cpp.go b/pkg/build/builders/cpp.go index a37f39b..ef2478e 100644 --- a/pkg/build/builders/cpp.go +++ b/pkg/build/builders/cpp.go @@ -8,8 +8,8 @@ import ( "dappco.re/go/core" "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // CPPBuilder implements the Builder interface for C++ projects using CMake + Conan. diff --git a/pkg/build/builders/cpp_test.go b/pkg/build/builders/cpp_test.go index d7d3b9b..a4b5497 100644 --- a/pkg/build/builders/cpp_test.go +++ b/pkg/build/builders/cpp_test.go @@ -9,7 +9,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func setupFakeCPPCommand(t *testing.T, binDir, name, script string) { diff --git a/pkg/build/builders/deno.go b/pkg/build/builders/deno.go index 337fad5..86b022c 100644 --- a/pkg/build/builders/deno.go +++ b/pkg/build/builders/deno.go @@ -6,7 +6,7 @@ import ( "dappco.re/go/build/pkg/build" "dappco.re/go/core" - coreerr "dappco.re/go/core/log" + coreerr "dappco.re/go/log" ) // resolveDenoBuildCommand returns the Deno build invocation using the action-style diff --git a/pkg/build/builders/docker.go b/pkg/build/builders/docker.go index c966675..2c6a1b7 100644 --- a/pkg/build/builders/docker.go +++ b/pkg/build/builders/docker.go @@ -8,8 +8,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // DockerBuilder builds Docker images. diff --git a/pkg/build/builders/docker_test.go b/pkg/build/builders/docker_test.go index 286a52b..7ec2100 100644 --- a/pkg/build/builders/docker_test.go +++ b/pkg/build/builders/docker_test.go @@ -10,7 +10,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - coreio "dappco.re/go/core/io" + coreio "dappco.re/go/io" ) func setupFakeDockerToolchain(t *testing.T, binDir string) { diff --git a/pkg/build/builders/docs.go b/pkg/build/builders/docs.go index 048bc1f..8e14097 100644 --- a/pkg/build/builders/docs.go +++ b/pkg/build/builders/docs.go @@ -12,8 +12,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // DocsBuilder builds MkDocs projects. diff --git a/pkg/build/builders/docs_test.go b/pkg/build/builders/docs_test.go index 6ef5a82..3f4d574 100644 --- a/pkg/build/builders/docs_test.go +++ b/pkg/build/builders/docs_test.go @@ -10,7 +10,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestDocs_DocsBuilderName_Good(t *testing.T) { diff --git a/pkg/build/builders/env.go b/pkg/build/builders/env.go index 6a53eb2..2b00c7a 100644 --- a/pkg/build/builders/env.go +++ b/pkg/build/builders/env.go @@ -2,7 +2,7 @@ package builders import ( "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" + "dappco.re/go/io" ) // appendConfiguredEnv returns a fresh environment slice that includes the diff --git a/pkg/build/builders/go.go b/pkg/build/builders/go.go index 37cd019..9f8a0cc 100644 --- a/pkg/build/builders/go.go +++ b/pkg/build/builders/go.go @@ -7,8 +7,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // GoBuilder implements the Builder interface for Go projects. diff --git a/pkg/build/builders/go_test.go b/pkg/build/builders/go_test.go index 947ed84..2fa9f67 100644 --- a/pkg/build/builders/go_test.go +++ b/pkg/build/builders/go_test.go @@ -10,7 +10,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" + "dappco.re/go/io" ) // setupGoTestProject creates a minimal Go project for testing. diff --git a/pkg/build/builders/linuxkit.go b/pkg/build/builders/linuxkit.go index 8cbe899..3f59369 100644 --- a/pkg/build/builders/linuxkit.go +++ b/pkg/build/builders/linuxkit.go @@ -7,8 +7,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // LinuxKitBuilder builds LinuxKit images. diff --git a/pkg/build/builders/linuxkit_image.go b/pkg/build/builders/linuxkit_image.go index 76c5bb9..0aaee32 100644 --- a/pkg/build/builders/linuxkit_image.go +++ b/pkg/build/builders/linuxkit_image.go @@ -13,8 +13,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // LinuxKitImageBuilder renders and builds immutable LinuxKit base images. diff --git a/pkg/build/builders/linuxkit_image_test.go b/pkg/build/builders/linuxkit_image_test.go index 240ca2d..fd50320 100644 --- a/pkg/build/builders/linuxkit_image_test.go +++ b/pkg/build/builders/linuxkit_image_test.go @@ -7,7 +7,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" + "dappco.re/go/io" "errors" ) diff --git a/pkg/build/builders/linuxkit_test.go b/pkg/build/builders/linuxkit_test.go index 16bfe88..ce99b42 100644 --- a/pkg/build/builders/linuxkit_test.go +++ b/pkg/build/builders/linuxkit_test.go @@ -8,7 +8,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func setupFakeLinuxKitToolchain(t *testing.T, binDir string) { diff --git a/pkg/build/builders/node.go b/pkg/build/builders/node.go index 1777614..d921cd4 100644 --- a/pkg/build/builders/node.go +++ b/pkg/build/builders/node.go @@ -9,8 +9,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // NodeBuilder builds Node.js projects with the detected package manager. diff --git a/pkg/build/builders/node_test.go b/pkg/build/builders/node_test.go index 7b57a16..65dde9f 100644 --- a/pkg/build/builders/node_test.go +++ b/pkg/build/builders/node_test.go @@ -9,7 +9,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func setupFakeNodeToolchain(t *testing.T, binDir string) { diff --git a/pkg/build/builders/package_manager.go b/pkg/build/builders/package_manager.go index 8edb6d7..80ce114 100644 --- a/pkg/build/builders/package_manager.go +++ b/pkg/build/builders/package_manager.go @@ -3,7 +3,7 @@ package builders import ( "dappco.re/go/core" "dappco.re/go/build/internal/ax" - "dappco.re/go/core/io" + "dappco.re/go/io" ) type packageJSONManifest struct { diff --git a/pkg/build/builders/php.go b/pkg/build/builders/php.go index 8b6c59f..a293f45 100644 --- a/pkg/build/builders/php.go +++ b/pkg/build/builders/php.go @@ -12,8 +12,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // PHPBuilder builds PHP projects with composer.json manifests. diff --git a/pkg/build/builders/php_test.go b/pkg/build/builders/php_test.go index 36a6860..f9b7645 100644 --- a/pkg/build/builders/php_test.go +++ b/pkg/build/builders/php_test.go @@ -10,7 +10,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func setupFakePHPToolchain(t *testing.T, binDir string) { diff --git a/pkg/build/builders/python.go b/pkg/build/builders/python.go index cf00514..43d940a 100644 --- a/pkg/build/builders/python.go +++ b/pkg/build/builders/python.go @@ -12,8 +12,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // PythonBuilder builds Python projects with pyproject.toml or requirements.txt markers. diff --git a/pkg/build/builders/python_test.go b/pkg/build/builders/python_test.go index 04f78b9..6e234c5 100644 --- a/pkg/build/builders/python_test.go +++ b/pkg/build/builders/python_test.go @@ -8,7 +8,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" + "dappco.re/go/io" "os" ) diff --git a/pkg/build/builders/rust.go b/pkg/build/builders/rust.go index 9096e98..ec42dda 100644 --- a/pkg/build/builders/rust.go +++ b/pkg/build/builders/rust.go @@ -8,8 +8,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // RustBuilder implements the Builder interface for Rust projects. diff --git a/pkg/build/builders/rust_test.go b/pkg/build/builders/rust_test.go index 324adcf..fea6500 100644 --- a/pkg/build/builders/rust_test.go +++ b/pkg/build/builders/rust_test.go @@ -8,7 +8,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func setupFakeRustToolchain(t *testing.T, binDir string) { diff --git a/pkg/build/builders/taskfile.go b/pkg/build/builders/taskfile.go index b4dbbbe..b8126a9 100644 --- a/pkg/build/builders/taskfile.go +++ b/pkg/build/builders/taskfile.go @@ -9,8 +9,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // TaskfileBuilder builds projects using Taskfile (https://taskfile.dev/). diff --git a/pkg/build/builders/taskfile_test.go b/pkg/build/builders/taskfile_test.go index 423cc93..5b96efa 100644 --- a/pkg/build/builders/taskfile_test.go +++ b/pkg/build/builders/taskfile_test.go @@ -9,7 +9,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestTaskfile_TaskfileBuilderName_Good(t *testing.T) { diff --git a/pkg/build/builders/wails.go b/pkg/build/builders/wails.go index 071b96d..714133a 100644 --- a/pkg/build/builders/wails.go +++ b/pkg/build/builders/wails.go @@ -9,8 +9,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // WailsBuilder implements the Builder interface for Wails v3 projects. diff --git a/pkg/build/builders/wails_test.go b/pkg/build/builders/wails_test.go index 45cf5aa..e8a352e 100644 --- a/pkg/build/builders/wails_test.go +++ b/pkg/build/builders/wails_test.go @@ -9,7 +9,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" + "dappco.re/go/io" ) // setupWailsTestProject creates a minimal Wails project structure for testing. diff --git a/pkg/build/builtin_resolver.go b/pkg/build/builtin_resolver.go index 2e7af3f..84c5fd9 100644 --- a/pkg/build/builtin_resolver.go +++ b/pkg/build/builtin_resolver.go @@ -6,8 +6,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) func resolveBuiltinBuilder(projectType ProjectType) (Builder, error) { diff --git a/pkg/build/cache.go b/pkg/build/cache.go index 870bc78..db99423 100644 --- a/pkg/build/cache.go +++ b/pkg/build/cache.go @@ -9,8 +9,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" "gopkg.in/yaml.v3" ) diff --git a/pkg/build/cache_test.go b/pkg/build/cache_test.go index 2538e80..826757a 100644 --- a/pkg/build/cache_test.go +++ b/pkg/build/cache_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestCache_SetupCache_Good(t *testing.T) { diff --git a/pkg/build/checksum.go b/pkg/build/checksum.go index 988c001..ff7474d 100644 --- a/pkg/build/checksum.go +++ b/pkg/build/checksum.go @@ -9,8 +9,8 @@ import ( "dappco.re/go/core" "dappco.re/go/build/internal/ax" - io_interface "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + io_interface "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // Checksum computes SHA256 for an artifact and returns the artifact with the Checksum field filled. diff --git a/pkg/build/checksum_test.go b/pkg/build/checksum_test.go index 696b2e7..3ee66f0 100644 --- a/pkg/build/checksum_test.go +++ b/pkg/build/checksum_test.go @@ -5,7 +5,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/core" - "dappco.re/go/core/io" + "dappco.re/go/io" "os" ) diff --git a/pkg/build/ci.go b/pkg/build/ci.go index 4d34b94..ff68bb5 100644 --- a/pkg/build/ci.go +++ b/pkg/build/ci.go @@ -7,8 +7,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/core" - io_interface "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + io_interface "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // CIContext holds environment information detected from a GitHub Actions run. diff --git a/pkg/build/ci_test.go b/pkg/build/ci_test.go index 2903cd9..c713677 100644 --- a/pkg/build/ci_test.go +++ b/pkg/build/ci_test.go @@ -6,7 +6,7 @@ import ( "testing" "dappco.re/go/build/internal/ax" - "dappco.re/go/core/io" + "dappco.re/go/io" ) // setenvCI sets the GitHub Actions environment variables for a test and cleans up afterwards. diff --git a/pkg/build/config.go b/pkg/build/config.go index e237575..25ec1ab 100644 --- a/pkg/build/config.go +++ b/pkg/build/config.go @@ -9,8 +9,8 @@ import ( "dappco.re/go/build/pkg/build/signing" "dappco.re/go/build/pkg/sdk" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" "gopkg.in/yaml.v3" ) diff --git a/pkg/build/config_test.go b/pkg/build/config_test.go index b062e43..65227e6 100644 --- a/pkg/build/config_test.go +++ b/pkg/build/config_test.go @@ -7,7 +7,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/sdk" - "dappco.re/go/core/io" + "dappco.re/go/io" "gopkg.in/yaml.v3" ) diff --git a/pkg/build/discovery.go b/pkg/build/discovery.go index 2b2bafc..c6b7079 100644 --- a/pkg/build/discovery.go +++ b/pkg/build/discovery.go @@ -3,7 +3,7 @@ package build import ( "dappco.re/go/build/internal/ax" "dappco.re/go/core" - "dappco.re/go/core/io" + "dappco.re/go/io" ) // Marker files for project type detection. diff --git a/pkg/build/discovery_test.go b/pkg/build/discovery_test.go index 1de59ed..9077cf8 100644 --- a/pkg/build/discovery_test.go +++ b/pkg/build/discovery_test.go @@ -6,7 +6,7 @@ import ( "dappco.re/go/build/internal/ax" - "dappco.re/go/core/io" + "dappco.re/go/io" ) // setupTestDir creates a temporary directory with the specified marker files. diff --git a/pkg/build/installers/installer.go b/pkg/build/installers/installer.go index b5b398b..def9844 100644 --- a/pkg/build/installers/installer.go +++ b/pkg/build/installers/installer.go @@ -9,7 +9,7 @@ import ( "strings" "text/template" - coreerr "dappco.re/go/core/log" + coreerr "dappco.re/go/log" ) //go:embed templates/*.tmpl diff --git a/pkg/build/linuxkit_templates.go b/pkg/build/linuxkit_templates.go index 7e1736a..35b7f49 100644 --- a/pkg/build/linuxkit_templates.go +++ b/pkg/build/linuxkit_templates.go @@ -3,7 +3,7 @@ package build import ( "embed" - coreerr "dappco.re/go/core/log" + coreerr "dappco.re/go/log" ) //go:embed images/*.yml diff --git a/pkg/build/pipeline.go b/pkg/build/pipeline.go index 6e977d6..26e6e82 100644 --- a/pkg/build/pipeline.go +++ b/pkg/build/pipeline.go @@ -6,8 +6,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // BuilderResolver resolves a project type into a concrete builder. diff --git a/pkg/build/pipeline_test.go b/pkg/build/pipeline_test.go index be7ccc7..edec913 100644 --- a/pkg/build/pipeline_test.go +++ b/pkg/build/pipeline_test.go @@ -6,7 +6,7 @@ import ( "testing" "dappco.re/go/build/internal/ax" - "dappco.re/go/core/io" + "dappco.re/go/io" "errors" ) diff --git a/pkg/build/run.go b/pkg/build/run.go index cc0294c..41f0120 100644 --- a/pkg/build/run.go +++ b/pkg/build/run.go @@ -7,8 +7,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/core" - coreio "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + coreio "dappco.re/go/io" + coreerr "dappco.re/go/log" ) var defaultBuilderResolver BuilderResolver diff --git a/pkg/build/run_test.go b/pkg/build/run_test.go index cc5ac42..c4d78d0 100644 --- a/pkg/build/run_test.go +++ b/pkg/build/run_test.go @@ -6,7 +6,7 @@ import ( "testing" "dappco.re/go/build/internal/ax" - coreio "dappco.re/go/core/io" + coreio "dappco.re/go/io" ) type runTestBuilder struct { diff --git a/pkg/build/runtime_config.go b/pkg/build/runtime_config.go index 20acb0c..0e9d841 100644 --- a/pkg/build/runtime_config.go +++ b/pkg/build/runtime_config.go @@ -3,7 +3,7 @@ package build import ( "strings" - "dappco.re/go/core/io" + "dappco.re/go/io" ) // RuntimeConfigFromBuildConfig maps persisted build settings onto a runtime diff --git a/pkg/build/runtime_config_test.go b/pkg/build/runtime_config_test.go index 74ac202..20c4d78 100644 --- a/pkg/build/runtime_config_test.go +++ b/pkg/build/runtime_config_test.go @@ -3,7 +3,7 @@ package build import ( "testing" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestBuild_RuntimeConfigFromBuildConfig_Good(t *testing.T) { diff --git a/pkg/build/setup.go b/pkg/build/setup.go index 4949a1a..f1ef64e 100644 --- a/pkg/build/setup.go +++ b/pkg/build/setup.go @@ -5,7 +5,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/core" - "dappco.re/go/core/io" + "dappco.re/go/io" ) // SetupTool identifies a toolchain or installer surface required by the diff --git a/pkg/build/setup_test.go b/pkg/build/setup_test.go index ed2dcd2..65202aa 100644 --- a/pkg/build/setup_test.go +++ b/pkg/build/setup_test.go @@ -4,7 +4,7 @@ import ( "testing" "dappco.re/go/build/internal/ax" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestSetup_ComputeSetupPlan_Good(t *testing.T) { diff --git a/pkg/build/signing/codesign.go b/pkg/build/signing/codesign.go index 518d8d8..0f54111 100644 --- a/pkg/build/signing/codesign.go +++ b/pkg/build/signing/codesign.go @@ -5,8 +5,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // MacOSSigner signs binaries using macOS codesign. diff --git a/pkg/build/signing/codesign_test.go b/pkg/build/signing/codesign_test.go index 94f7419..6cc185e 100644 --- a/pkg/build/signing/codesign_test.go +++ b/pkg/build/signing/codesign_test.go @@ -6,7 +6,7 @@ import ( "testing" "dappco.re/go/build/internal/ax" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestCodesign_MacOSSignerName_Good(t *testing.T) { diff --git a/pkg/build/signing/gpg.go b/pkg/build/signing/gpg.go index ae980d8..d983fc2 100644 --- a/pkg/build/signing/gpg.go +++ b/pkg/build/signing/gpg.go @@ -4,8 +4,8 @@ import ( "context" "dappco.re/go/build/internal/ax" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // GPGSigner signs files using GPG. diff --git a/pkg/build/signing/gpg_test.go b/pkg/build/signing/gpg_test.go index ae39107..3a7f4f2 100644 --- a/pkg/build/signing/gpg_test.go +++ b/pkg/build/signing/gpg_test.go @@ -5,7 +5,7 @@ import ( "testing" "dappco.re/go/build/internal/ax" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestGPG_GPGSignerName_Good(t *testing.T) { diff --git a/pkg/build/signing/sign.go b/pkg/build/signing/sign.go index 4d8859f..c275fe2 100644 --- a/pkg/build/signing/sign.go +++ b/pkg/build/signing/sign.go @@ -5,8 +5,8 @@ import ( "runtime" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // Artifact represents a build output that can be signed. diff --git a/pkg/build/signing/signer.go b/pkg/build/signing/signer.go index 2805144..80e2358 100644 --- a/pkg/build/signing/signer.go +++ b/pkg/build/signing/signer.go @@ -5,7 +5,7 @@ import ( "context" "dappco.re/go/core" - "dappco.re/go/core/io" + "dappco.re/go/io" ) // Signer defines the interface for code signing implementations. diff --git a/pkg/build/signing/signing_test.go b/pkg/build/signing/signing_test.go index 6c86ae2..837d4f5 100644 --- a/pkg/build/signing/signing_test.go +++ b/pkg/build/signing/signing_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestSigning_SignBinariesSkipsNonDarwin_Good(t *testing.T) { diff --git a/pkg/build/signing/signtool.go b/pkg/build/signing/signtool.go index 3dcaf5e..64a1d99 100644 --- a/pkg/build/signing/signtool.go +++ b/pkg/build/signing/signtool.go @@ -5,8 +5,8 @@ import ( "runtime" "dappco.re/go/build/internal/ax" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // WindowsSigner signs binaries using Windows signtool. diff --git a/pkg/build/signing/signtool_test.go b/pkg/build/signing/signtool_test.go index b3dc52d..9d54cc1 100644 --- a/pkg/build/signing/signtool_test.go +++ b/pkg/build/signing/signtool_test.go @@ -6,7 +6,7 @@ import ( "testing" "dappco.re/go/build/internal/ax" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestSigntool_NewWindowsSigner_Good(t *testing.T) { diff --git a/pkg/build/version_flags.go b/pkg/build/version_flags.go index 9a7878c..ad1fbdf 100644 --- a/pkg/build/version_flags.go +++ b/pkg/build/version_flags.go @@ -4,7 +4,7 @@ import ( "regexp" "dappco.re/go/core" - coreerr "dappco.re/go/core/log" + coreerr "dappco.re/go/log" ) var safeVersionLinkerValue = regexp.MustCompile(`^[A-Za-z0-9._+-]+$`) diff --git a/pkg/build/workflow.go b/pkg/build/workflow.go index e83b042..351e000 100644 --- a/pkg/build/workflow.go +++ b/pkg/build/workflow.go @@ -7,8 +7,8 @@ import ( "dappco.re/go/core" "dappco.re/go/build/internal/ax" - io_interface "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + io_interface "dappco.re/go/io" + coreerr "dappco.re/go/log" ) //go:embed templates/release.yml diff --git a/pkg/build/workflow_test.go b/pkg/build/workflow_test.go index bc32bbc..292b532 100644 --- a/pkg/build/workflow_test.go +++ b/pkg/build/workflow_test.go @@ -5,7 +5,7 @@ import ( "testing" "dappco.re/go/build/internal/ax" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestWorkflow_WriteReleaseWorkflow_Good(t *testing.T) { diff --git a/pkg/build/xcode_cloud.go b/pkg/build/xcode_cloud.go index 2f64ff3..91d4ed5 100644 --- a/pkg/build/xcode_cloud.go +++ b/pkg/build/xcode_cloud.go @@ -5,8 +5,8 @@ import ( "dappco.re/go/core" "dappco.re/go/build/internal/ax" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) const ( diff --git a/pkg/build/xcode_cloud_test.go b/pkg/build/xcode_cloud_test.go index 89041e5..1fc1e8f 100644 --- a/pkg/build/xcode_cloud_test.go +++ b/pkg/build/xcode_cloud_test.go @@ -4,7 +4,7 @@ import ( "testing" "dappco.re/go/build/internal/ax" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestXcodeCloud_HasXcodeCloudConfig_Good(t *testing.T) { diff --git a/pkg/release/changelog.go b/pkg/release/changelog.go index 8fba553..3209599 100644 --- a/pkg/release/changelog.go +++ b/pkg/release/changelog.go @@ -10,7 +10,7 @@ import ( "dappco.re/go/core" "dappco.re/go/build/internal/ax" - coreerr "dappco.re/go/core/log" + coreerr "dappco.re/go/log" "golang.org/x/text/cases" "golang.org/x/text/language" ) diff --git a/pkg/release/config.go b/pkg/release/config.go index aa509d1..c9d2be7 100644 --- a/pkg/release/config.go +++ b/pkg/release/config.go @@ -7,8 +7,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/sdk" "dappco.re/go/core" - coreio "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + coreio "dappco.re/go/io" + coreerr "dappco.re/go/log" "gopkg.in/yaml.v3" ) diff --git a/pkg/release/config_test.go b/pkg/release/config_test.go index 6fe5c81..b67c701 100644 --- a/pkg/release/config_test.go +++ b/pkg/release/config_test.go @@ -4,7 +4,7 @@ import ( "testing" "dappco.re/go/build/internal/ax" - "dappco.re/go/core/io" + "dappco.re/go/io" ) // setupConfigTestDir creates a temp directory with optional .core/release.yaml content. diff --git a/pkg/release/output.go b/pkg/release/output.go index cb173a9..64cff73 100644 --- a/pkg/release/output.go +++ b/pkg/release/output.go @@ -8,8 +8,8 @@ import ( "dappco.re/go/core" "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - coreio "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + coreio "dappco.re/go/io" + coreerr "dappco.re/go/log" ) func resolveReleaseOutputMedium(cfg *Config) coreio.Medium { diff --git a/pkg/release/publishers/assets_test.go b/pkg/release/publishers/assets_test.go index 522556e..ced726e 100644 --- a/pkg/release/publishers/assets_test.go +++ b/pkg/release/publishers/assets_test.go @@ -4,7 +4,7 @@ import ( "testing" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestAssets_BuildChecksumMap_ParsesRFCArchiveNames_Good(t *testing.T) { diff --git a/pkg/release/publishers/aur.go b/pkg/release/publishers/aur.go index 2550dd4..8c198de 100644 --- a/pkg/release/publishers/aur.go +++ b/pkg/release/publishers/aur.go @@ -9,8 +9,8 @@ import ( "dappco.re/go/core" "dappco.re/go/build/internal/ax" - coreio "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + coreio "dappco.re/go/io" + coreerr "dappco.re/go/log" ) //go:embed templates/aur/*.tmpl diff --git a/pkg/release/publishers/aur_test.go b/pkg/release/publishers/aur_test.go index 6de92fc..c9f1f75 100644 --- a/pkg/release/publishers/aur_test.go +++ b/pkg/release/publishers/aur_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestAUR_AURPublisherName_Good(t *testing.T) { diff --git a/pkg/release/publishers/chocolatey.go b/pkg/release/publishers/chocolatey.go index a7504e0..a638c59 100644 --- a/pkg/release/publishers/chocolatey.go +++ b/pkg/release/publishers/chocolatey.go @@ -9,9 +9,9 @@ import ( "dappco.re/go/core" "dappco.re/go/build/internal/ax" - "dappco.re/go/core/i18n" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/i18n" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) //go:embed templates/chocolatey/*.tmpl templates/chocolatey/tools/*.tmpl diff --git a/pkg/release/publishers/chocolatey_test.go b/pkg/release/publishers/chocolatey_test.go index b2c13f9..f0f57af 100644 --- a/pkg/release/publishers/chocolatey_test.go +++ b/pkg/release/publishers/chocolatey_test.go @@ -5,7 +5,7 @@ import ( "testing" "dappco.re/go/build/internal/ax" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestChocolatey_ChocolateyPublisherName_Good(t *testing.T) { diff --git a/pkg/release/publishers/docker.go b/pkg/release/publishers/docker.go index 3ff770c..1551e74 100644 --- a/pkg/release/publishers/docker.go +++ b/pkg/release/publishers/docker.go @@ -7,8 +7,8 @@ import ( "dappco.re/go/core" "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // DockerConfig holds configuration for the Docker publisher. diff --git a/pkg/release/publishers/docker_test.go b/pkg/release/publishers/docker_test.go index 7361e07..e65faa7 100644 --- a/pkg/release/publishers/docker_test.go +++ b/pkg/release/publishers/docker_test.go @@ -5,7 +5,7 @@ import ( "testing" "dappco.re/go/build/internal/ax" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestDocker_DockerPublisherName_Good(t *testing.T) { diff --git a/pkg/release/publishers/github.go b/pkg/release/publishers/github.go index 6a5a700..f266a74 100644 --- a/pkg/release/publishers/github.go +++ b/pkg/release/publishers/github.go @@ -14,8 +14,8 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/core" - coreio "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + coreio "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // GitHubPublisher publishes releases to GitHub using the gh CLI. diff --git a/pkg/release/publishers/github_test.go b/pkg/release/publishers/github_test.go index f3697d4..fa6e15f 100644 --- a/pkg/release/publishers/github_test.go +++ b/pkg/release/publishers/github_test.go @@ -9,7 +9,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" "dappco.re/go/core" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestGitHub_ParseGitHubRepo_Good(t *testing.T) { diff --git a/pkg/release/publishers/homebrew.go b/pkg/release/publishers/homebrew.go index bb083e8..9020699 100644 --- a/pkg/release/publishers/homebrew.go +++ b/pkg/release/publishers/homebrew.go @@ -11,8 +11,8 @@ import ( "dappco.re/go/core" "dappco.re/go/build/internal/ax" - coreio "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + coreio "dappco.re/go/io" + coreerr "dappco.re/go/log" ) //go:embed templates/homebrew/*.tmpl diff --git a/pkg/release/publishers/homebrew_test.go b/pkg/release/publishers/homebrew_test.go index 1119909..ce4e9fa 100644 --- a/pkg/release/publishers/homebrew_test.go +++ b/pkg/release/publishers/homebrew_test.go @@ -6,7 +6,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" + "dappco.re/go/io" "os" ) diff --git a/pkg/release/publishers/integration_test.go b/pkg/release/publishers/integration_test.go index 783ea8e..f695764 100644 --- a/pkg/release/publishers/integration_test.go +++ b/pkg/release/publishers/integration_test.go @@ -6,7 +6,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" + "dappco.re/go/io" ) // --- GitHub Publisher Integration Tests --- diff --git a/pkg/release/publishers/linuxkit.go b/pkg/release/publishers/linuxkit.go index 34cc7fb..e8b5c21 100644 --- a/pkg/release/publishers/linuxkit.go +++ b/pkg/release/publishers/linuxkit.go @@ -6,7 +6,7 @@ import ( "dappco.re/go/core" "dappco.re/go/build/internal/ax" - coreerr "dappco.re/go/core/log" + coreerr "dappco.re/go/log" ) // LinuxKitConfig holds configuration for the LinuxKit publisher. diff --git a/pkg/release/publishers/linuxkit_test.go b/pkg/release/publishers/linuxkit_test.go index bdac94b..e2df600 100644 --- a/pkg/release/publishers/linuxkit_test.go +++ b/pkg/release/publishers/linuxkit_test.go @@ -5,7 +5,7 @@ import ( "testing" "dappco.re/go/build/internal/ax" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestLinuxKit_LinuxKitPublisherName_Good(t *testing.T) { diff --git a/pkg/release/publishers/npm.go b/pkg/release/publishers/npm.go index 81abab9..f3ad059 100644 --- a/pkg/release/publishers/npm.go +++ b/pkg/release/publishers/npm.go @@ -9,8 +9,8 @@ import ( "dappco.re/go/core" "dappco.re/go/build/internal/ax" - coreio "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + coreio "dappco.re/go/io" + coreerr "dappco.re/go/log" ) //go:embed templates/npm/*.tmpl diff --git a/pkg/release/publishers/npm_test.go b/pkg/release/publishers/npm_test.go index 3824d60..07111ae 100644 --- a/pkg/release/publishers/npm_test.go +++ b/pkg/release/publishers/npm_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestNpm_NpmPublisherName_Good(t *testing.T) { diff --git a/pkg/release/publishers/publisher.go b/pkg/release/publishers/publisher.go index 7bebd0b..7b323dd 100644 --- a/pkg/release/publishers/publisher.go +++ b/pkg/release/publishers/publisher.go @@ -7,8 +7,8 @@ import ( "dappco.re/go/core" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // Release represents a release to be published. diff --git a/pkg/release/publishers/scoop.go b/pkg/release/publishers/scoop.go index f301cc0..772edd5 100644 --- a/pkg/release/publishers/scoop.go +++ b/pkg/release/publishers/scoop.go @@ -9,8 +9,8 @@ import ( "dappco.re/go/core" "dappco.re/go/build/internal/ax" - coreio "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + coreio "dappco.re/go/io" + coreerr "dappco.re/go/log" ) //go:embed templates/scoop/*.tmpl diff --git a/pkg/release/publishers/scoop_test.go b/pkg/release/publishers/scoop_test.go index fca531b..6125815 100644 --- a/pkg/release/publishers/scoop_test.go +++ b/pkg/release/publishers/scoop_test.go @@ -6,7 +6,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" + "dappco.re/go/io" "os" ) diff --git a/pkg/release/publishers/version_validation_test.go b/pkg/release/publishers/version_validation_test.go index fffc0c4..5b7f4b6 100644 --- a/pkg/release/publishers/version_validation_test.go +++ b/pkg/release/publishers/version_validation_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestPublishers_PublishRejectsUnsafeVersion_Good(t *testing.T) { diff --git a/pkg/release/release.go b/pkg/release/release.go index 7a31edd..cf04ebb 100644 --- a/pkg/release/release.go +++ b/pkg/release/release.go @@ -14,8 +14,8 @@ import ( "dappco.re/go/build/pkg/build/signing" "dappco.re/go/build/pkg/release/publishers" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // release signing hooks allow tests to observe the release pipeline without diff --git a/pkg/release/release_test.go b/pkg/release/release_test.go index fa06dac..9458784 100644 --- a/pkg/release/release_test.go +++ b/pkg/release/release_test.go @@ -10,7 +10,7 @@ import ( "dappco.re/go/build/pkg/build" "dappco.re/go/build/pkg/build/signing" "dappco.re/go/core" - "dappco.re/go/core/io" + "dappco.re/go/io" ) func TestRelease_FindArtifacts_Good(t *testing.T) { diff --git a/pkg/release/sdk.go b/pkg/release/sdk.go index 8032d41..c555b86 100644 --- a/pkg/release/sdk.go +++ b/pkg/release/sdk.go @@ -8,8 +8,8 @@ import ( "dappco.re/go/build/pkg/build" "dappco.re/go/build/pkg/sdk" "dappco.re/go/core" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) // SDKRelease holds the result of an SDK release. diff --git a/pkg/release/version.go b/pkg/release/version.go index b9497e4..4382f3b 100644 --- a/pkg/release/version.go +++ b/pkg/release/version.go @@ -10,7 +10,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/build" "dappco.re/go/core" - coreerr "dappco.re/go/core/log" + coreerr "dappco.re/go/log" ) // semverRegex matches semantic version strings with or without 'v' prefix. diff --git a/pkg/sdk/detect.go b/pkg/sdk/detect.go index 0b1f23f..0e3f626 100644 --- a/pkg/sdk/detect.go +++ b/pkg/sdk/detect.go @@ -5,7 +5,7 @@ import ( "dappco.re/go/core" "dappco.re/go/build/internal/ax" - coreerr "dappco.re/go/core/log" + coreerr "dappco.re/go/log" ) // commonSpecPaths are checked in order when no spec is configured. diff --git a/pkg/sdk/diff.go b/pkg/sdk/diff.go index ecbbfad..b9d804d 100644 --- a/pkg/sdk/diff.go +++ b/pkg/sdk/diff.go @@ -2,7 +2,7 @@ package sdk import ( "dappco.re/go/core" - coreerr "dappco.re/go/core/log" + coreerr "dappco.re/go/log" "github.com/oasdiff/kin-openapi/openapi3" "github.com/oasdiff/oasdiff/checker" "github.com/oasdiff/oasdiff/diff" diff --git a/pkg/sdk/generators/docker_runtime.go b/pkg/sdk/generators/docker_runtime.go index 8514af3..cbaeab1 100644 --- a/pkg/sdk/generators/docker_runtime.go +++ b/pkg/sdk/generators/docker_runtime.go @@ -11,7 +11,7 @@ import ( "time" "dappco.re/go/build/internal/ax" - coreerr "dappco.re/go/core/log" + coreerr "dappco.re/go/log" ) var ( diff --git a/pkg/sdk/generators/go.go b/pkg/sdk/generators/go.go index d28c0fd..5870681 100644 --- a/pkg/sdk/generators/go.go +++ b/pkg/sdk/generators/go.go @@ -5,7 +5,7 @@ import ( "dappco.re/go/core" "dappco.re/go/build/internal/ax" - coreerr "dappco.re/go/core/log" + coreerr "dappco.re/go/log" ) // GoGenerator generates Go SDKs from OpenAPI specs. diff --git a/pkg/sdk/generators/php.go b/pkg/sdk/generators/php.go index 9fefda0..04b51af 100644 --- a/pkg/sdk/generators/php.go +++ b/pkg/sdk/generators/php.go @@ -4,7 +4,7 @@ import ( "context" "dappco.re/go/build/internal/ax" - coreerr "dappco.re/go/core/log" + coreerr "dappco.re/go/log" ) // PHPGenerator generates PHP SDKs from OpenAPI specs. diff --git a/pkg/sdk/generators/python.go b/pkg/sdk/generators/python.go index bf92d9c..8f2408d 100644 --- a/pkg/sdk/generators/python.go +++ b/pkg/sdk/generators/python.go @@ -4,7 +4,7 @@ import ( "context" "dappco.re/go/build/internal/ax" - coreerr "dappco.re/go/core/log" + coreerr "dappco.re/go/log" ) // PythonGenerator generates Python SDKs from OpenAPI specs. diff --git a/pkg/sdk/generators/typescript.go b/pkg/sdk/generators/typescript.go index 8bb159b..8c1781c 100644 --- a/pkg/sdk/generators/typescript.go +++ b/pkg/sdk/generators/typescript.go @@ -7,7 +7,7 @@ import ( "strings" "dappco.re/go/build/internal/ax" - coreerr "dappco.re/go/core/log" + coreerr "dappco.re/go/log" ) // TypeScriptGenerator generates TypeScript SDKs from OpenAPI specs. diff --git a/pkg/sdk/sdk.go b/pkg/sdk/sdk.go index 6913367..33d72aa 100644 --- a/pkg/sdk/sdk.go +++ b/pkg/sdk/sdk.go @@ -7,7 +7,7 @@ import ( "dappco.re/go/build/internal/ax" "dappco.re/go/build/pkg/sdk/generators" "dappco.re/go/core" - coreerr "dappco.re/go/core/log" + coreerr "dappco.re/go/log" "gopkg.in/yaml.v3" ) diff --git a/pkg/sdk/validate.go b/pkg/sdk/validate.go index 40ad206..ec1ad9a 100644 --- a/pkg/sdk/validate.go +++ b/pkg/sdk/validate.go @@ -5,7 +5,7 @@ import ( "github.com/oasdiff/kin-openapi/openapi3" - coreerr "dappco.re/go/core/log" + coreerr "dappco.re/go/log" ) // ValidateSpec detects and validates the OpenAPI specification for this SDK. diff --git a/pkg/service/agentic.go b/pkg/service/agentic.go index 10bac0f..dca42f3 100644 --- a/pkg/service/agentic.go +++ b/pkg/service/agentic.go @@ -3,8 +3,8 @@ package service import ( "context" - providerpkg "dappco.re/go/core/api/pkg/provider" - "dappco.re/go/core/ws" + providerpkg "dappco.re/go/api/pkg/provider" + "dappco.re/go/ws" ) type agenticOrchestrator interface { diff --git a/pkg/service/agentic_test.go b/pkg/service/agentic_test.go index e7d0b83..f2f537b 100644 --- a/pkg/service/agentic_test.go +++ b/pkg/service/agentic_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - providerpkg "dappco.re/go/core/api/pkg/provider" + providerpkg "dappco.re/go/api/pkg/provider" ) type emittedAgenticEvent struct { diff --git a/pkg/service/config.go b/pkg/service/config.go index d341961..827930d 100644 --- a/pkg/service/config.go +++ b/pkg/service/config.go @@ -10,8 +10,8 @@ import ( "unicode" "dappco.re/go/build/pkg/build" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" + "dappco.re/go/io" + coreerr "dappco.re/go/log" ) const ( diff --git a/pkg/service/daemon.go b/pkg/service/daemon.go index bbf9871..4f54229 100644 --- a/pkg/service/daemon.go +++ b/pkg/service/daemon.go @@ -15,12 +15,12 @@ import ( "dappco.re/go/build/pkg/build" "dappco.re/go/build/pkg/build/builders" "dappco.re/go/build/pkg/release" - coreapi "dappco.re/go/core/api" - providerpkg "dappco.re/go/core/api/pkg/provider" - "dappco.re/go/core/io" - coreerr "dappco.re/go/core/log" - "dappco.re/go/core/process" - "dappco.re/go/core/ws" + coreapi "dappco.re/go/api" + providerpkg "dappco.re/go/api/pkg/provider" + "dappco.re/go/io" + coreerr "dappco.re/go/log" + "dappco.re/go/process" + "dappco.re/go/ws" ) type apiEngine interface { diff --git a/pkg/service/daemon_run_test.go b/pkg/service/daemon_run_test.go index cb55167..b8bc69f 100644 --- a/pkg/service/daemon_run_test.go +++ b/pkg/service/daemon_run_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - coreapi "dappco.re/go/core/api" - providerpkg "dappco.re/go/core/api/pkg/provider" - "dappco.re/go/core/process" - "dappco.re/go/core/ws" + coreapi "dappco.re/go/api" + providerpkg "dappco.re/go/api/pkg/provider" + "dappco.re/go/process" + "dappco.re/go/ws" ) type stubAPIEngine struct { diff --git a/pkg/service/mcp.go b/pkg/service/mcp.go index 0ec5eb1..f0e4ecd 100644 --- a/pkg/service/mcp.go +++ b/pkg/service/mcp.go @@ -4,9 +4,9 @@ import ( "net/http" "sort" - coreapi "dappco.re/go/core/api" - providerpkg "dappco.re/go/core/api/pkg/provider" - "dappco.re/go/core/ws" + coreapi "dappco.re/go/api" + providerpkg "dappco.re/go/api/pkg/provider" + "dappco.re/go/ws" "github.com/gin-gonic/gin" ) diff --git a/pkg/service/mcp_test.go b/pkg/service/mcp_test.go index e03bbc9..5da4f61 100644 --- a/pkg/service/mcp_test.go +++ b/pkg/service/mcp_test.go @@ -9,8 +9,8 @@ import ( "testing" "dappco.re/go/build/internal/ax" - coreapi "dappco.re/go/core/api" - providerpkg "dappco.re/go/core/api/pkg/provider" + coreapi "dappco.re/go/api" + providerpkg "dappco.re/go/api/pkg/provider" ) func TestMCP_DefaultNewMCPServer_ExposesDaemonTools_Good(t *testing.T) { diff --git a/pkg/service/test_helpers_test.go b/pkg/service/test_helpers_test.go index f27bc04..a14dcdb 100644 --- a/pkg/service/test_helpers_test.go +++ b/pkg/service/test_helpers_test.go @@ -1,7 +1,7 @@ package service import ( - providerpkg "dappco.re/go/core/api/pkg/provider" + providerpkg "dappco.re/go/api/pkg/provider" "github.com/gin-gonic/gin" )