From 15f1204543a2d940f89d9f945886320a71f9f067 Mon Sep 17 00:00:00 2001
From: Chirayu Desai <chirayudesai1@gmail.com>
Date: Wed, 2 Mar 2022 05:07:10 +0530
Subject: [PATCH] Fix CalyxVPN 1.1.2

* Copied from se.leap.riseupvpn.yml, as always
---
 metadata/org.calyxinstitute.vpn.yml | 43 ++++++++++-------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/metadata/org.calyxinstitute.vpn.yml b/metadata/org.calyxinstitute.vpn.yml
index e6cf40b1c7..d0fa6f789c 100644
--- a/metadata/org.calyxinstitute.vpn.yml
+++ b/metadata/org.calyxinstitute.vpn.yml
@@ -175,46 +175,33 @@ Builds:
     ndk: r20b
 
   - versionName: 1.1.2
-    versionCode: 160
-    commit: 85fd6f640b6bbda3b148cc26af649148bf0909ee
+    versionCode: 160000
+    commit: calyx/1.1.2
     subdir: app
     submodules: true
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y -t testing golang-go
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - customProductionFat
-    prebuild:
-      - $$SDK$$/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3' >
-        /dev/null
-      - sed -i -e "/^task updateSdkLicences/,/^}/d; /commandLine 'git'/d" build.gradle
-      - sed -i -e '/android {/a ndkVersion = "20.1.5948944"' ../ics-openvpn/main/build.gradle.kts
+    rm:
+      - tor-android/external/openssl/fuzz
+      - tor-android/external/openssl/boringssl/fuzz
+    prebuild: sed -i -e 's|./gradlew|gradle|' ../scripts/build_deps.sh
     scandelete:
-      - bitmask-core
-      - bitmask-web-core
-      - go/src
+      - lib-bitmask-core*
+      - bitmaskcore/IPtProxy
       - ics-openvpn/main/src/main/cpp
-    build:
-      - cd ../go
-      - export GOPATH="$PWD"
-      - export GO_COMPILED="$PWD/bin"
-      - export PATH="$GO_COMPILED:$PATH"
-      - go get golang.org/x/mobile/cmd/gomobile
-      - gomobile init
-      - mkdir -p ./lib
-      - gomobile bind -target=android -o ./lib/bitmask-web-core.aar se.leap.bitmaskclient/shapeshifter/
-        se.leap.bitmaskclient/pgpverify
-      - cp lib/bitmask-web-core* ../bitmask-web-core/.
-      - gomobile bind -target=android -o ./lib/bitmask-core.aar se.leap.bitmaskclient/shapeshifter/
-      - cp lib/bitmask-core* ../bitmask-core/.
-      - cd ../ics-openvpn
-      - gradle main:externalNativeBuildCleanSkeletonRelease main:externalNativeBuildSkeletonRelease
-    ndk: r20b
+      - tor-android/external
+    build: ../scripts/build_deps.sh
+    ndk: r21e
 
 MaintainerNotes: The "build" commands are extracted from build_deps.sh.
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^calyx\/[0-9.]+$
+VercodeOperation: 1000*%c
 UpdateCheckName: se.leap.bitmaskclient
 CurrentVersion: 1.1.2
-CurrentVersionCode: 160
+CurrentVersionCode: 160000