Move app UI package under internal/appui
This commit is contained in:
@@ -6,7 +6,7 @@ APP_ID ?= org.julianfamily.keepassgo
|
||||
APK_OUT ?= build/keepassgo.apk
|
||||
APK_VERSION ?= 0.1.0.1
|
||||
APP_VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo dev)
|
||||
GO_LDFLAGS ?= -X git.julianfamily.org/keepassgo.appVersion=$(APP_VERSION)
|
||||
GO_LDFLAGS ?= -X git.julianfamily.org/keepassgo/internal/appui.appVersion=$(APP_VERSION)
|
||||
ANDROID_MIN_SDK ?= 28
|
||||
ANDROID_TARGET_SDK ?= 35
|
||||
SIGNKEY ?=
|
||||
|
||||
@@ -45,7 +45,7 @@ By default, build outputs stamp the app version from `git describe --tags --alwa
|
||||
You can override the version shown in KeePassGO with:
|
||||
|
||||
```bash
|
||||
go build -ldflags "-X git.julianfamily.org/keepassgo.appVersion=v0.0.1" ./cmd/keepassgo
|
||||
go build -ldflags "-X git.julianfamily.org/keepassgo/internal/appui.appVersion=v0.0.1" ./cmd/keepassgo
|
||||
```
|
||||
|
||||
## Arch Linux Package
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ const (
|
||||
DefaultAppID = "org.julianfamily.keepassgo"
|
||||
DefaultAPKOut = "build/keepassgo.apk"
|
||||
DefaultVersion = "0.1.0.1"
|
||||
DefaultLdflags = "-X git.julianfamily.org/keepassgo.appVersion=dev"
|
||||
DefaultLdflags = "-X git.julianfamily.org/keepassgo/internal/appui.appVersion=dev"
|
||||
DefaultMinSDK = "28"
|
||||
DefaultTargetSDK = "35"
|
||||
DefaultIconPath = "assets/keepassgo-icon.png"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package main
|
||||
|
||||
import keepassgo "git.julianfamily.org/keepassgo"
|
||||
import "git.julianfamily.org/keepassgo/internal/appui"
|
||||
|
||||
func main() {
|
||||
keepassgo.Main()
|
||||
appui.Main()
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
//go:build android
|
||||
|
||||
package keepassgo
|
||||
package appui
|
||||
|
||||
/*
|
||||
#cgo CFLAGS: -Werror
|
||||
@@ -1,6 +1,6 @@
|
||||
//go:build !android
|
||||
|
||||
package keepassgo
|
||||
package appui
|
||||
|
||||
func newPlatformVaultSharer(goos string) vaultSharer {
|
||||
return nil
|
||||
@@ -1,4 +1,4 @@
|
||||
package keepassgo
|
||||
package appui
|
||||
|
||||
import (
|
||||
"crypto/sha256"
|
||||
@@ -1,4 +1,4 @@
|
||||
package keepassgo
|
||||
package appui
|
||||
|
||||
import (
|
||||
"io"
|
||||
@@ -1,4 +1,4 @@
|
||||
package keepassgo
|
||||
package appui
|
||||
|
||||
import (
|
||||
"slices"
|
||||
@@ -1,4 +1,4 @@
|
||||
package keepassgo
|
||||
package appui
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
@@ -1,4 +1,4 @@
|
||||
package keepassgo
|
||||
package appui
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@@ -1,4 +1,4 @@
|
||||
package keepassgo
|
||||
package appui
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@@ -1,4 +1,4 @@
|
||||
package keepassgo
|
||||
package appui
|
||||
|
||||
import (
|
||||
"image"
|
||||
@@ -1,4 +1,4 @@
|
||||
package keepassgo
|
||||
package appui
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@@ -1,4 +1,4 @@
|
||||
package keepassgo
|
||||
package appui
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@@ -1,4 +1,4 @@
|
||||
package keepassgo
|
||||
package appui
|
||||
|
||||
import (
|
||||
"image"
|
||||
@@ -1,4 +1,4 @@
|
||||
package keepassgo
|
||||
package appui
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@@ -1,4 +1,4 @@
|
||||
package keepassgo
|
||||
package appui
|
||||
|
||||
import (
|
||||
"image"
|
||||
@@ -1,4 +1,4 @@
|
||||
package keepassgo
|
||||
package appui
|
||||
|
||||
import (
|
||||
"gioui.org/layout"
|
||||
@@ -1,4 +1,4 @@
|
||||
package keepassgo
|
||||
package appui
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
@@ -1,4 +1,4 @@
|
||||
package keepassgo
|
||||
package appui
|
||||
|
||||
import (
|
||||
"strings"
|
||||
@@ -1,4 +1,4 @@
|
||||
package keepassgo
|
||||
package appui
|
||||
|
||||
import (
|
||||
"image/color"
|
||||
@@ -1,4 +1,4 @@
|
||||
package keepassgo
|
||||
package appui
|
||||
|
||||
import (
|
||||
"runtime"
|
||||
@@ -41,7 +41,7 @@ build() {
|
||||
export GOFLAGS="-trimpath"
|
||||
local app_version
|
||||
app_version="$(git describe --tags --always --dirty)"
|
||||
go build -ldflags "-X git.julianfamily.org/keepassgo.appVersion=${app_version}" -o keepassgo ./cmd/keepassgo
|
||||
go build -ldflags "-X git.julianfamily.org/keepassgo/internal/appui.appVersion=${app_version}" -o keepassgo ./cmd/keepassgo
|
||||
}
|
||||
|
||||
package() {
|
||||
|
||||
Reference in New Issue
Block a user