Merge pull request #69 from lucor/reelase/v1.1.1

Reelase v1.1.1
fyne-io · Sep 30, 2021 · 9792b2e · 9792b2e
2 parents a002416 + c3e1fd1
commit 9792b2e
Show file tree

Hide file tree

Showing 15 changed files with 245 additions and 169 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog - Fyne.io fyne-cross
 
+## 1.1.1 - 29 Sep 2021
+
+### Added
+
+-  Support specifying target architectures for Android #52
+
+### Changed
+
+- Switch to x/sys/execabs for windows security fixes #57
+- [base-image] update Go to v1.16.8 and Fyne CLI tool to v2.1.0 #67
+
 ## 1.1.0 - 14 May 2021
 
 ### Added

diff --git a/README.md b/README.md
@@ -18,7 +18,11 @@ Supported targets are:
   -  linux/arm64
   -  windows/amd64
   -  windows/386
-  -  android
+  -  android ([multiple architectures](https://developer.android.com/ndk/guides/abis))
+  -  android/386
+  -  android/amd64
+  -  android/arm
+  -  android/arm64
   -  ios
 
 > Note: 

diff --git a/docker/CHANGELOG.md b/docker/CHANGELOG.md
@@ -23,6 +23,13 @@ above.
 
 Example: `fyneio/fyne-cross:1.1-base-21.03.17`
 
+## Release 21.09.29
+- Update Go to v1.16.8
+- Update fyne CLI to v2.1.0
+
+### Release 21.06.07
+- Update Go to v1.16.5
+
 ### Release 21.05.08
 - Update Go to v1.16.4
 - Update fyne CLI to v2.0.3

diff --git a/docker/android/Dockerfile b/docker/android/Dockerfile
@@ -3,11 +3,11 @@ FROM fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base
 
 ENV JAVA_HOME /usr/local/android_jdk8
 ENV ANDROID_HOME /usr/local/android_sdk
-ENV ANDROID_SDK_TOOLS_VERSION 4333796
-ENV ANDROID_SDK_TOOLS_SHA256SUM 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9
-ENV ANDROID_SDK_BUILD_TOOLS_VERSION 29.0.2
+ENV COMMANDLINETOOLS_VERSION 7583922
+ENV COMMANDLINETOOLS_SHA256SUM 124f2d5115eee365df6cf3228ffbca6fc3911d16f8025bebd5b1c6e2fcfa7faf
+ENV ANDROID_SDK_BUILD_TOOLS_VERSION 30.0.3
 ENV ANDROID_SDK_BUILD_TOOLS_BIN ${ANDROID_HOME}/build-tools/${ANDROID_SDK_BUILD_TOOLS_VERSION}
-ENV ANDROID_SDK_PLATFORM 29
+ENV ANDROID_SDK_PLATFORM 30
 ENV ANDROID_NDK_BIN ${ANDROID_HOME}/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin
 
 ENV PATH=${PATH}:${JAVA_HOME}/bin:${ANDROID_NDK_BIN}:${ANDROID_SDK_BUILD_TOOLS_BIN}
@@ -18,14 +18,16 @@ RUN wget -O jdk8.tgz "https://android.googlesource.com/platform/prebuilts/jdk/jd
 	tar zxvf jdk8.tgz -C ${JAVA_HOME}; \
 	rm jdk8.tgz
 
-# Install SDK
-RUN wget -O sdk.zip "https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS_VERSION}.zip"; \
-	echo "${ANDROID_SDK_TOOLS_SHA256SUM} *sdk.zip" | sha256sum -c -; \
-	unzip -d ${ANDROID_HOME} sdk.zip; \
+# Install command line tools
+RUN wget -O sdk.zip "https://dl.google.com/android/repository/commandlinetools-linux-${COMMANDLINETOOLS_VERSION}_latest.zip"; \
+	echo "${COMMANDLINETOOLS_SHA256SUM} *sdk.zip" | sha256sum -c -; \
+	unzip -d /tmp sdk.zip; \
+	mkdir -p ${ANDROID_HOME}/cmdline-tools; \
+	mv /tmp/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest; \
 	rm sdk.zip;
 
 # Install tools, platforms and ndk
-RUN yes | ${ANDROID_HOME}/tools/bin/sdkmanager \
+RUN yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager \
 	"build-tools;${ANDROID_SDK_BUILD_TOOLS_VERSION}" \
 	"ndk-bundle" \
 	"platforms;android-${ANDROID_SDK_PLATFORM}" \

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
@@ -1,6 +1,6 @@
-ARG GO_VERSION=1.16.4
+ARG GO_VERSION=1.16.8
 # fyne stable branch
-ARG FYNE_VERSION=v2.0.3
+ARG FYNE_VERSION=v2.1.0
 
 FROM golang:${GO_VERSION}-buster AS tools
 ARG FYNE_VERSION

diff --git a/go.mod b/go.mod
@@ -5,4 +5,5 @@ go 1.13
 require (
 	github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9
 	github.com/stretchr/testify v1.6.1
+	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
 )
diff --git a/go.sum b/go.sum
@@ -4,10 +4,11 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=

diff --git a/internal/cmd/gowindres/main.go b/internal/cmd/gowindres/main.go
@@ -8,9 +8,10 @@ import (
 	"fmt"
 	"log"
 	"os"
-	"os/exec"
 	"path"
 	"text/template"
+
+	"golang.org/x/sys/execabs"
 )
 
 var (
@@ -65,7 +66,7 @@ func main() {
 		target = target386
 	}
 
-	cmd := exec.Command(windresBin, "-F", target, "-o", resource, rc)
+	cmd := execabs.Command(windresBin, "-F", target, "-o", resource, rc)
 	cmd.Dir = workDir
 	out, err := cmd.CombinedOutput()
 	if err != nil {