Move app packages under internal

APK.md

@@ -34,7 +34,7 @@ go tool gogio -target android ./cmd/keepassgo ...
 
 The Android build uses the branded icon asset at:
 
-- `assets/keepassgo-icon.png`
+- `internal/assets/keepassgo-icon.png`
 
 Note:
 

Makefile

@@ -47,7 +47,7 @@ apk: android/keepassgo-android.jar
 		-version $(APK_VERSION) \
 		-minsdk $(ANDROID_MIN_SDK) \
 		-targetsdk $(ANDROID_TARGET_SDK) \
-		-icon assets/keepassgo-icon.png \
+		-icon internal/assets/keepassgo-icon.png \
 		./cmd/keepassgo
 
 android/keepassgo-android.jar: $(shell find androidsrc -type f | sort)

README.md

@@ -89,7 +89,7 @@ go get -tool gioui.org/cmd/gogio@latest
 Package:
 
 ```bash
-go tool gogio -target android -icon assets/keepassgo-icon.png ./cmd/keepassgo
+go tool gogio -target android -icon internal/assets/keepassgo-icon.png ./cmd/keepassgo
 ```
 
 You will need the Android SDK and NDK installed and configured for real device or release packaging.

buildapk/config.go

@@ -16,7 +16,7 @@ const (
 	DefaultLdflags   = "-X git.julianfamily.org/keepassgo/internal/appui.appVersion=dev"
 	DefaultMinSDK    = "28"
 	DefaultTargetSDK = "35"
-	DefaultIconPath  = "assets/keepassgo-icon.png"
+	DefaultIconPath  = "internal/assets/keepassgo-icon.png"
 )
 
 type Config struct {

internal/api/host.go

@@ -7,11 +7,11 @@ import (
 	"strings"
 	"sync"
 
-	"git.julianfamily.org/keepassgo/clipboard"
+	"git.julianfamily.org/keepassgo/internal/clipboard"
-	"git.julianfamily.org/keepassgo/passwords"
+	"git.julianfamily.org/keepassgo/internal/passwords"
+	"git.julianfamily.org/keepassgo/internal/session"
+	"git.julianfamily.org/keepassgo/internal/vault"
 	keepassgov1 "git.julianfamily.org/keepassgo/proto/keepassgo/v1"
-	"git.julianfamily.org/keepassgo/session"
-	"git.julianfamily.org/keepassgo/vault"
 	"google.golang.org/grpc"
 )
 

internal/api/host_test.go

@@ -5,10 +5,10 @@ import (
 	"net"
 	"testing"
 
-	"git.julianfamily.org/keepassgo/passwords"
+	"git.julianfamily.org/keepassgo/internal/passwords"
+	"git.julianfamily.org/keepassgo/internal/session"
+	"git.julianfamily.org/keepassgo/internal/vault"
 	keepassgov1 "git.julianfamily.org/keepassgo/proto/keepassgo/v1"
-	"git.julianfamily.org/keepassgo/session"
-	"git.julianfamily.org/keepassgo/vault"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )

internal/api/server.go

@@ -10,15 +10,15 @@ import (
 	"sync"
 	"time"
 
-	"git.julianfamily.org/keepassgo/apiaudit"
+	"git.julianfamily.org/keepassgo/internal/apiapproval"
-	"git.julianfamily.org/keepassgo/apiapproval"
+	"git.julianfamily.org/keepassgo/internal/apiaudit"
-	"git.julianfamily.org/keepassgo/apitokens"
+	"git.julianfamily.org/keepassgo/internal/apitokens"
-	"git.julianfamily.org/keepassgo/clipboard"
+	"git.julianfamily.org/keepassgo/internal/clipboard"
-	"git.julianfamily.org/keepassgo/passwords"
+	"git.julianfamily.org/keepassgo/internal/passwords"
+	"git.julianfamily.org/keepassgo/internal/session"
+	"git.julianfamily.org/keepassgo/internal/vault"
+	"git.julianfamily.org/keepassgo/internal/webdav"
 	keepassgov1 "git.julianfamily.org/keepassgo/proto/keepassgo/v1"
-	"git.julianfamily.org/keepassgo/session"
-	"git.julianfamily.org/keepassgo/vault"
-	"git.julianfamily.org/keepassgo/webdav"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"

internal/api/server_test.go

@@ -10,14 +10,14 @@ import (
 	"testing"
 	"time"
 
-	"git.julianfamily.org/keepassgo/apiaudit"
+	"git.julianfamily.org/keepassgo/internal/apiapproval"
-	"git.julianfamily.org/keepassgo/apiapproval"
+	"git.julianfamily.org/keepassgo/internal/apiaudit"
-	"git.julianfamily.org/keepassgo/apitokens"
+	"git.julianfamily.org/keepassgo/internal/apitokens"
-	"git.julianfamily.org/keepassgo/passwords"
+	"git.julianfamily.org/keepassgo/internal/passwords"
+	"git.julianfamily.org/keepassgo/internal/session"
+	"git.julianfamily.org/keepassgo/internal/vault"
+	"git.julianfamily.org/keepassgo/internal/webdav"
 	keepassgov1 "git.julianfamily.org/keepassgo/proto/keepassgo/v1"
-	"git.julianfamily.org/keepassgo/session"
-	"git.julianfamily.org/keepassgo/vault"
-	"git.julianfamily.org/keepassgo/webdav"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials/insecure"

internal/apiapproval/approval.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"git.julianfamily.org/keepassgo/apitokens"
+	"git.julianfamily.org/keepassgo/internal/apitokens"
 )
 
 var (

internal/apiapproval/approval_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"git.julianfamily.org/keepassgo/apitokens"
+	"git.julianfamily.org/keepassgo/internal/apitokens"
 )
 
 func TestBrokerCreatesPendingRequestAndAllowsOnce(t *testing.T) {

internal/apiaudit/audit.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	"git.julianfamily.org/keepassgo/apitokens"
+	"git.julianfamily.org/keepassgo/internal/apitokens"
 )
 
 type EventType string

internal/apiaudit/audit_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"git.julianfamily.org/keepassgo/apitokens"
+	"git.julianfamily.org/keepassgo/internal/apitokens"
 )
 
 func TestLogKeepsNewestEventsWithinBound(t *testing.T) {

internal/apitokens/tokens.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 	"time"
 
-	"git.julianfamily.org/keepassgo/vault"
+	"git.julianfamily.org/keepassgo/internal/vault"
 )
 
 const (

internal/apitokens/tokens_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"git.julianfamily.org/keepassgo/vault"
+	"git.julianfamily.org/keepassgo/internal/vault"
 )
 
 func TestTokenEntryRoundTripsThroughVaultEntry(t *testing.T) {

internal/appstate/remote_binding.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"git.julianfamily.org/keepassgo/vault"
+	"git.julianfamily.org/keepassgo/internal/vault"
 )
 
 type SyncMode string

internal/appstate/remote_binding_test.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"git.julianfamily.org/keepassgo/vault"
+	"git.julianfamily.org/keepassgo/internal/vault"
 )
 
 func TestRemoteBindingResolveUsesVaultProfileAndCredentialEntry(t *testing.T) {

internal/appstate/state.go

@@ -7,10 +7,10 @@ import (
 	"strings"
 	"time"
 
-	"git.julianfamily.org/keepassgo/apiapproval"
+	"git.julianfamily.org/keepassgo/internal/apiapproval"
-	"git.julianfamily.org/keepassgo/apitokens"
+	"git.julianfamily.org/keepassgo/internal/apitokens"
-	"git.julianfamily.org/keepassgo/vault"
+	"git.julianfamily.org/keepassgo/internal/vault"
-	"git.julianfamily.org/keepassgo/webdav"
+	"git.julianfamily.org/keepassgo/internal/webdav"
 )
 
 type Section string

internal/appstate/state_test.go

@@ -6,11 +6,11 @@ import (
 	"testing"
 	"time"
 
-	"git.julianfamily.org/keepassgo/apiapproval"
+	"git.julianfamily.org/keepassgo/internal/apiapproval"
-	"git.julianfamily.org/keepassgo/apitokens"
+	"git.julianfamily.org/keepassgo/internal/apitokens"
-	"git.julianfamily.org/keepassgo/session"
+	"git.julianfamily.org/keepassgo/internal/session"
-	"git.julianfamily.org/keepassgo/vault"
+	"git.julianfamily.org/keepassgo/internal/vault"
-	"git.julianfamily.org/keepassgo/webdav"
+	"git.julianfamily.org/keepassgo/internal/webdav"
 )
 
 func TestVisibleEntriesFollowsCurrentPathWithoutSearch(t *testing.T) {

internal/appui/app.go

@@ -31,18 +31,18 @@ import (
 	"gioui.org/widget"
 	"gioui.org/widget/material"
 	"gioui.org/x/explorer"
-	"git.julianfamily.org/keepassgo/api"
+	"git.julianfamily.org/keepassgo/internal/api"
-	"git.julianfamily.org/keepassgo/apiapproval"
+	"git.julianfamily.org/keepassgo/internal/apiapproval"
-	"git.julianfamily.org/keepassgo/apiaudit"
+	"git.julianfamily.org/keepassgo/internal/apiaudit"
-	"git.julianfamily.org/keepassgo/apitokens"
+	"git.julianfamily.org/keepassgo/internal/apitokens"
-	"git.julianfamily.org/keepassgo/appstate"
+	"git.julianfamily.org/keepassgo/internal/appstate"
-	keepassassets "git.julianfamily.org/keepassgo/assets"
+	keepassassets "git.julianfamily.org/keepassgo/internal/assets"
-	"git.julianfamily.org/keepassgo/autofillcache"
+	"git.julianfamily.org/keepassgo/internal/autofillcache"
-	"git.julianfamily.org/keepassgo/clipboard"
+	"git.julianfamily.org/keepassgo/internal/clipboard"
-	"git.julianfamily.org/keepassgo/passwords"
+	"git.julianfamily.org/keepassgo/internal/passwords"
-	"git.julianfamily.org/keepassgo/session"
+	"git.julianfamily.org/keepassgo/internal/session"
-	"git.julianfamily.org/keepassgo/vault"
+	"git.julianfamily.org/keepassgo/internal/vault"
-	"git.julianfamily.org/keepassgo/webdav"
+	"git.julianfamily.org/keepassgo/internal/webdav"
 	"golang.org/x/exp/shiny/materialdesign/icons"
 )
 

internal/appui/clipboard_gio.go

@@ -8,7 +8,7 @@ import (
 	gioclipboard "gioui.org/io/clipboard"
 	"gioui.org/layout"
 
-	appclipboard "git.julianfamily.org/keepassgo/clipboard"
+	appclipboard "git.julianfamily.org/keepassgo/internal/clipboard"
 )
 
 type clipboardCommandWriter struct {

internal/appui/main_test.go

@@ -21,15 +21,15 @@ import (
 	"gioui.org/unit"
 	"gioui.org/widget"
 
-	"git.julianfamily.org/keepassgo/apiapproval"
+	"git.julianfamily.org/keepassgo/internal/apiapproval"
-	"git.julianfamily.org/keepassgo/apiaudit"
+	"git.julianfamily.org/keepassgo/internal/apiaudit"
-	"git.julianfamily.org/keepassgo/apitokens"
+	"git.julianfamily.org/keepassgo/internal/apitokens"
-	"git.julianfamily.org/keepassgo/appstate"
+	"git.julianfamily.org/keepassgo/internal/appstate"
-	"git.julianfamily.org/keepassgo/clipboard"
+	"git.julianfamily.org/keepassgo/internal/clipboard"
-	"git.julianfamily.org/keepassgo/passwords"
+	"git.julianfamily.org/keepassgo/internal/passwords"
-	"git.julianfamily.org/keepassgo/session"
+	"git.julianfamily.org/keepassgo/internal/session"
-	"git.julianfamily.org/keepassgo/vault"
+	"git.julianfamily.org/keepassgo/internal/vault"
-	"git.julianfamily.org/keepassgo/webdav"
+	"git.julianfamily.org/keepassgo/internal/webdav"
 )
 
 func TestMain(m *testing.M) {

internal/appui/ui_api.go

@@ -10,8 +10,8 @@ import (
 	"gioui.org/unit"
 	"gioui.org/widget"
 	"gioui.org/widget/material"
-	"git.julianfamily.org/keepassgo/apiaudit"
+	"git.julianfamily.org/keepassgo/internal/apiaudit"
-	"git.julianfamily.org/keepassgo/apitokens"
+	"git.julianfamily.org/keepassgo/internal/apitokens"
 )
 
 func apiOperations() []apitokens.Operation {

internal/appui/ui_editor.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	"gioui.org/widget"
-	"git.julianfamily.org/keepassgo/clipboard"
+	"git.julianfamily.org/keepassgo/internal/clipboard"
-	"git.julianfamily.org/keepassgo/passwords"
+	"git.julianfamily.org/keepassgo/internal/passwords"
-	"git.julianfamily.org/keepassgo/vault"
+	"git.julianfamily.org/keepassgo/internal/vault"
 )
 
 func (u *ui) attachmentInput() (string, []byte, error) {

internal/appui/ui_forms.go

@@ -15,7 +15,7 @@ import (
 	"gioui.org/unit"
 	"gioui.org/widget"
 	"gioui.org/widget/material"
-	"git.julianfamily.org/keepassgo/appstate"
+	"git.julianfamily.org/keepassgo/internal/appstate"
 )
 
 func (u *ui) lifecycleControls(gtx layout.Context) layout.Dimensions {

internal/appui/ui_keyboard.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"gioui.org/io/key"
-	"git.julianfamily.org/keepassgo/appstate"
+	"git.julianfamily.org/keepassgo/internal/appstate"
 )
 
 type focusID string

internal/appui/ui_preferences.go

@@ -12,7 +12,7 @@ import (
 	"gioui.org/unit"
 	"gioui.org/widget"
 	"gioui.org/widget/material"
-	"git.julianfamily.org/keepassgo/vault"
+	"git.julianfamily.org/keepassgo/internal/vault"
 )
 
 const (

internal/appui/ui_shortcuts.go

@@ -7,7 +7,7 @@ import (
 	"gioui.org/io/key"
 	"gioui.org/layout"
 
-	"git.julianfamily.org/keepassgo/clipboard"
+	"git.julianfamily.org/keepassgo/internal/clipboard"
 )
 
 const (

internal/appui/ui_sync_menu_model.go

@@ -4,7 +4,7 @@ import (
 	"runtime"
 	"strings"
 
-	"git.julianfamily.org/keepassgo/appstate"
+	"git.julianfamily.org/keepassgo/internal/appstate"
 )
 
 type syncMenuModel struct {

internal/autofillcache/cache.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"git.julianfamily.org/keepassgo/vault"
+	"git.julianfamily.org/keepassgo/internal/vault"
 )
 
 type Entry struct {

internal/autofillcache/cache_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"git.julianfamily.org/keepassgo/vault"
+	"git.julianfamily.org/keepassgo/internal/vault"
 )
 
 func TestBuildFiltersAndNormalizesEntries(t *testing.T) {

internal/clipboard/service.go

@@ -5,7 +5,7 @@ import (
 
 	systemclipboard "github.com/atotto/clipboard"
 
-	"git.julianfamily.org/keepassgo/vault"
+	"git.julianfamily.org/keepassgo/internal/vault"
 )
 
 var ErrUnsupportedTarget = errors.New("unsupported clipboard target")

internal/clipboard/service_test.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"testing"
 
-	"git.julianfamily.org/keepassgo/vault"
+	"git.julianfamily.org/keepassgo/internal/vault"
 )
 
 func TestServiceCopiesUsernamePasswordAndURL(t *testing.T) {

internal/session/session.go

@@ -11,8 +11,8 @@ import (
 	"slices"
 	"strings"
 
-	"git.julianfamily.org/keepassgo/vault"
+	"git.julianfamily.org/keepassgo/internal/vault"
-	"git.julianfamily.org/keepassgo/webdav"
+	"git.julianfamily.org/keepassgo/internal/webdav"
 )
 
 var (

internal/session/session_test.go

@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"git.julianfamily.org/keepassgo/vault"
+	"git.julianfamily.org/keepassgo/internal/vault"
-	"git.julianfamily.org/keepassgo/webdav"
+	"git.julianfamily.org/keepassgo/internal/webdav"
 	"github.com/tobischo/gokeepasslib/v3"
 	w "github.com/tobischo/gokeepasslib/v3/wrappers"
 )

packaging/archlinux/keepassgo-git/PKGBUILD.tmpl

@@ -48,9 +48,9 @@ package() {
   cd "$(_repo_dir)"
 
   install -Dm755 keepassgo "${pkgdir}/usr/bin/keepassgo"
-  install -Dm644 assets/keepassgo-icon.png \
+  install -Dm644 internal/assets/keepassgo-icon.png \
     "${pkgdir}/usr/share/icons/hicolor/512x512/apps/keepassgo.png"
-  install -Dm644 assets/keepassgo-icon.svg \
+  install -Dm644 internal/assets/keepassgo-icon.svg \
     "${pkgdir}/usr/share/icons/hicolor/scalable/apps/keepassgo.svg"
   install -Dm644 packaging/archlinux/keepassgo-git/keepassgo.desktop \
     "${pkgdir}/usr/share/applications/keepassgo.desktop"