From 2a4ac0999bb241508b8a4f11d6ace56b64be65f3 Mon Sep 17 00:00:00 2001 From: marinthiercelin Date: Wed, 9 Dec 2020 01:03:39 -0800 Subject: [PATCH] Change gomobile fork to use the github.com/ProtonMail/go-mobile fork (#107) * changed the go-mobile fork to use PM's fork * changed build dir in build.sh * changed the build dir so we need to change the upload source * fix syntax err in github action * fixed the error with the new build dir * added the java package flag for android builds * removed the other go-mobile forks from the go.sum Co-authored-by: marin thiercelin --- .github/workflows/android.yml | 10 ++++++++-- .github/workflows/ios.yml | 14 +++++++------- build.sh | 15 +++++++++++---- go.mod | 2 +- go.sum | 7 +++++-- 5 files changed, 32 insertions(+), 16 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 03fe0e2..bde4346 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -17,17 +17,23 @@ jobs: with: java-version: 1.8 + - name: Set up Go 1.15 + uses: actions/setup-go@v2 + with: + go-version: ^1.15.6 + id: go + - name: Checkout uses: actions/checkout@v2 - name: Build run: | ./build.sh android - find build + find dist - name: Upload Android artifacts uses: actions/upload-artifact@v2 with: name: Android build - path: build/android + path: dist/android if-no-files-found: error diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 35804db..626dd81 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -21,7 +21,7 @@ jobs: - name: Set up Go 1.15 uses: actions/setup-go@v2 with: - go-version: ^1.15 + go-version: ^1.15.6 id: go - name: Checkout @@ -32,39 +32,39 @@ jobs: platform: ${{ 'iOS Simulator' }} run: | ./build.sh apple - find build + find dist - name: Upload iOS artifacts uses: actions/upload-artifact@v2 with: name: iOS build - path: build/ios + path: dist/ios if-no-files-found: error - name: Upload mac OS artifacts uses: actions/upload-artifact@v2 with: name: mac OS build - path: build/macos + path: dist/macos if-no-files-found: error - name: Upload mac OS ui artifacts uses: actions/upload-artifact@v2 with: name: mac OS ui build - path: build/macos-ui + path: dist/macos-ui if-no-files-found: error - name: Upload iOS simulator artifacts uses: actions/upload-artifact@v2 with: name: iOS simulator build - path: build/ios-simulator + path: dist/ios-simulator if-no-files-found: error - name: Upload xcframework uses: actions/upload-artifact@v2 with: name: Gopenpgp xcframework - path: build/Gopenpgp.xcframework + path: dist/Gopenpgp.xcframework if-no-files-found: error diff --git a/build.sh b/build.sh index 960d0e0..e1766df 100755 --- a/build.sh +++ b/build.sh @@ -26,16 +26,23 @@ import() build() { TARGET=$1 + JAVA_PKG=$2 if [ $TARGET = "android" ]; then OUT_EXTENSION="aar" + if [ -z "$JAVA_PKG" ]; then + JAVAPKG_FLAG="-javapkg=$JAVA_PKG" + else + JAVAPKG_FLAG="" + fi else OUT_EXTENSION="framework" + JAVAPKG_FLAG="" fi TARGET_DIR=${BUILD_DIR}/${TARGET} TARGET_OUT_FILE=${TARGET_DIR}/${BUILD_NAME}.${OUT_EXTENSION} mkdir -p $TARGET_DIR printf "\e[0;32mStart Building ${TARGET} .. Location: ${TARGET_DIR} \033[0m\n\n" - gomobile bind -tags mobile -target $TARGET -x -o ${TARGET_OUT_FILE} -ldflags="${LDFLAGS}" ${PACKAGES} + gomobile bind -tags mobile -target $TARGET $JAVAPKG_FLAG -x -o ${TARGET_OUT_FILE} -ldflags="${LDFLAGS}" ${PACKAGES} } @@ -44,7 +51,7 @@ build() # ==== Generic parameters ====== # output directory -BUILD_DIR="./build" +BUILD_DIR="./dist" # linkage flags LDFLAGS="'all=-s -w'" @@ -113,8 +120,8 @@ xcodebuild -create-xcframework -framework $BUILD_DIR/ios/$BUILD_NAME.framework - fi # ================ Android Build ===================== if [ "$#" -ne 1 ] || [ $1 = android ]; then -ANDROID_JAVA_PAG="com.proton.${ANDROID_OUT_FILE_NAME}" -build android +ANDROID_JAVA_PAG="com.proton.${BUILD_NAME}" +build android $ANDROID_JAVA_PAG printf "\e[0;32mAll Done. \033[0m\n\n" fi diff --git a/go.mod b/go.mod index e74b47e..1d05406 100644 --- a/go.mod +++ b/go.mod @@ -10,4 +10,4 @@ require ( golang.org/x/mobile v0.0.0-20200801112145-973feb4309de ) -replace golang.org/x/mobile => github.com/marinthiercelin/mobile v0.0.0-20201127122539-61ba718dc1d1 +replace golang.org/x/mobile => github.com/ProtonMail/go-mobile v0.0.0-20201014085805-7a2d68bf792f diff --git a/go.sum b/go.sum index 0dfb997..c2e4bac 100644 --- a/go.sum +++ b/go.sum @@ -3,12 +3,13 @@ github.com/ProtonMail/go-crypto v0.0.0-20201208171014-cdb7591792e2 h1:pQkjJELHay github.com/ProtonMail/go-crypto v0.0.0-20201208171014-cdb7591792e2/go.mod h1:HTM9X7e9oLwn7RiqLG0UVwVRJenLs3wN+tQ0NPAfwMQ= github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a h1:W6RrgN/sTxg1msqzFFb+G80MFmpjMw61IU+slm+wln4= github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a/go.mod h1:NYt+V3/4rEeDuaev/zw1zCq8uqVEuPHzDPo3OZrlGJ4= +github.com/ProtonMail/go-mobile v0.0.0-20201014085805-7a2d68bf792f h1:u2i2ZBaZNzyJlIpyZWRJAoYMYqKObfJxvja3lr2olWw= +github.com/ProtonMail/go-mobile v0.0.0-20201014085805-7a2d68bf792f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/marinthiercelin/mobile v0.0.0-20201127122539-61ba718dc1d1/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -20,7 +21,6 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/zhj4478/mobile v0.0.0-20201014085805-7a2d68bf792f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -29,6 +29,7 @@ golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMx golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd h1:ePuNC7PZ6O5BzgPn9bZayERXBdfZjUYoXEf5BTfDfh8= golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -47,8 +48,10 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69 h1:yBHHx+XZqXJBm6Exke3N7V9gnlsyXxoCPEb1yVenjfk= golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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=