Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reelase v1.1.1 #69

Merged
merged 19 commits into from
Sep 30, 2021
Merged

Reelase v1.1.1 #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9583469
Update Go to v1.16.5
lucor Jun 7, 2021
28841db
Merge pull request #51 from lucor/feature/go1.16.5
lucor Jun 7, 2021
d555a64
Update Go to 1.16.6 for security fixes
Jacalz Aug 3, 2021
60ceaba
Switch to x/sys/execabs for windows security fixes
Jacalz Aug 3, 2021
1835d63
Merge pull request #56 from Jacalz/go-update
Jacalz Aug 4, 2021
a4dc1a6
Update Go and Fyne CMD to latest releases
Jacalz Aug 7, 2021
66adcec
Merge pull request #60 from Jacalz/update-go-again
Jacalz Aug 7, 2021
21ee353
Merge pull request #57 from Jacalz/execabs
lucor Aug 19, 2021
258f9f9
Update Go to v1.17.0
lucor Aug 19, 2021
cfad0ba
Update Android builds to SDK 30
lucor Aug 19, 2021
0615997
Revert "Update Go to v1.17.0"
lucor Aug 19, 2021
6b4bc88
Merge pull request #63 from lucor/feature/docker-go-1.17-android-30
lucor Aug 19, 2021
d2d85b0
Support specifying target architectures for Android
lucor Aug 20, 2021
33ab415
Merge branch 'master' into base-image-update
lucor Sep 18, 2021
5124b7a
This commit updates the docker base image.
lucor Sep 18, 2021
f318e6e
Update to use multiple architectures in place of universal
lucor Sep 18, 2021
80ebac0
Merge pull request #67 from lucor/base-image-update
lucor Sep 22, 2021
13e770d
Merge pull request #64 from lucor/feature/android-architectures
lucor Sep 29, 2021
c3e1fd1
Release v1.1.1
lucor Sep 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 5 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 7 additions & 0 deletions docker/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 11 additions & 9 deletions docker/android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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}" \
Expand Down
4 changes: 2 additions & 2 deletions docker/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
3 changes: 2 additions & 1 deletion go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
5 changes: 3 additions & 2 deletions internal/cmd/gowindres/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import (
"fmt"
"log"
"os"
"os/exec"
"path"
"text/template"

"golang.org/x/sys/execabs"
)

var (
Expand Down Expand Up @@ -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 {
Expand Down
Loading