Add support for M1 chips

buck.iml

@@ -123,8 +123,8 @@
     <orderEntry type="library" name="eden" level="project" />
     <orderEntry type="library" name="java-thrift-dependencies" level="project" />
     <orderEntry type="library" name="xz-java-1.5" level="project" />
-    <orderEntry type="library" name="jna-5.6.0" level="project" />
-    <orderEntry type="library" name="jna-platform-5.6.0" level="project" />
+    <orderEntry type="library" name="jna-5.7.0" level="project" />
+    <orderEntry type="library" name="jna-platform-5.7.0" level="project" />
     <orderEntry type="library" name="diffutils-1.3.0" level="project" />
     <orderEntry type="library" name="okio" level="project" />
     <orderEntry type="library" name="okhttp" level="project" />
@@ -150,7 +150,7 @@
     <orderEntry type="library" name="aapt2-proto-0.4.0" level="project" />
     <orderEntry type="library" name="commons-compress-1.18" level="project" />
     <orderEntry type="library" name="apksig" level="project" />
-    <orderEntry type="library" name="zstd-jni-1.4.0-1" level="project" />
+    <orderEntry type="library" name="zstd-jni-1.4.9-5" level="project" />
     <orderEntry type="library" name="a2api" level="project" />
     <orderEntry type="library" name="devspeed.logging" level="project" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
@@ -160,4 +160,4 @@
     <orderEntry type="library" name="jackson-module-kotlin-2.9.9" level="project" />
     <orderEntry type="library" name="log4j2" level="project" />
   </component>
-</module>
+</module>

build.xml

@@ -153,9 +153,9 @@
     <include name="kotlin/kotlin-reflect.jar" />
     <include name="android/sdklib-25.3.0.jar" />
     <include name="nailgun/nailgun-server-1.0.1.jar" />
-    <include name="jna/jna-5.6.0.jar" />
-    <include name="jna/jna-platform-5.6.0.jar" />
-    <include name="sqlite/sqlite-jdbc-3.20.0.jar" />
+    <include name="jna/jna-5.7.0.jar" />
+    <include name="jna/jna-platform-5.7.0.jar" />
+    <include name="sqlite/sqlite-jdbc-3.34.0.jar" />
     <include name="bazel/bazel_deploy.jar" />
     <include name="remote-apis/remote-apis.jar" />
   </fileset>
@@ -168,7 +168,7 @@
 
   <fileset dir="${third-party.dir}/java" id="third-party.jars">
     <patternset refid="third-party.jars.private"/>
-    <include name="ObjCBridge/java-objc-bridge-1.1-SNAPSHOT.jar" />
+    <include name="ObjCBridge/java-objc-bridge-1.1.jar" />
     <include name="aapt2-proto/aapt2-proto-0.4.0.jar" />
     <include name="android/common-25.3.0.jar" />
     <include name="android/layoutlib-api-25.3.0.jar" />
@@ -245,7 +245,7 @@
     <include name="stringtemplate/ST-4.0.8.jar" />
     <include name="thrift/libthrift-0.12.0.jar" />
     <include name="xz-java-1.5/xz-1.5.jar" />
-    <include name="zstd-jni/zstd-jni-1.4.0-1.jar" />
+    <include name="zstd-jni/zstd-jni-1.4.9-5.jar" />
     <include name="remote-apis/remote-apis.jar" />
     <include name="log4j2/log4j-api-2.17.1.jar" />
     <include name="log4j2/log4j-core-2.17.1.jar" />

programs/classpaths

@@ -59,16 +59,16 @@ third-party/java/jackson/jackson-datatype-jdk8-2.9.7.jar
 third-party/java/jackson/jackson-module-kotlin-2.9.9.jar
 third-party/java/jdom/jdom-2.0.6.jar
 third-party/java/jetty/jetty-all-9.4.9.v20180320-uber.jar
-third-party/java/jna/jna-5.6.0.jar
-third-party/java/jna/jna-platform-5.6.0.jar
+third-party/java/jna/jna-5.7.0.jar
+third-party/java/jna/jna-platform-5.7.0.jar
 third-party/java/jopt-simple/jopt-simple-4.6.jar
 third-party/java/json-simple/json-simple-1.1.1.jar
 third-party/java/jsr/javax.inject-1.jar
 third-party/java/jsr/jsr305.jar
 third-party/java/kxml2/kxml2-2.3.0.jar
 third-party/java/nailgun/nailgun-server-1.0.1.jar
 third-party/java/nuprocess/nuprocess-2.0.1.jar
-third-party/java/ObjCBridge/java-objc-bridge-1.1-SNAPSHOT.jar
+third-party/java/ObjCBridge/java-objc-bridge-1.1.jar
 third-party/java/objenesis/objenesis-1.2.jar
 third-party/java/okhttp/okhttp-3.9.0.jar
 third-party/java/okio/okio-1.13.0.jar
@@ -80,7 +80,7 @@ third-party/java/protobuf/protobuf-java-3.7.0.jar
 third-party/java/protobuf/protobuf-java-util-3.7.0.jar
 third-party/java/protobuf/protobuf-lite-3.0.1.jar
 third-party/java/slf4j/slf4j-jdk14-1.7.5.jar
-third-party/java/sqlite/sqlite-jdbc-3.20.0.jar
+third-party/java/sqlite/sqlite-jdbc-3.34.0.jar
 third-party/java/stringtemplate/ST-4.0.8.jar
 third-party/java/thrift/libthrift-0.12.0.jar
 third-party/java/xz-java-1.5/xz-1.5.jar

third-party/java/ObjCBridge/BUCK

@@ -1,10 +1,10 @@
 prebuilt_jar(
     name = "ObjCBridge",
-    binary_jar = "java-objc-bridge-1.1-SNAPSHOT.jar",
+    binary_jar = "java-objc-bridge-1.1.jar",
     licenses = [
         "LICENSE",
     ],
-    source_jar = "java-objc-bridge-1.1-SNAPSHOT-sources.jar",
+    source_jar = "java-objc-bridge-1.1-sources.jar",
     visibility = ["PUBLIC"],
     deps = [
         "//third-party/java/jna:jna",

third-party/java/ObjCBridge/README.facebook

@@ -1,16 +1,13 @@
-Project: Java Objective-C Bridge
-Version: Git revision c38d607820e18bdc607067457ba6680a6277f7cd
-Release Date: Sun Nov 3 19:35:06 2019 +0100
-Website: https://github.com/shannah/Java-Objective-C-Bridge/
+README for ObjCBridge
+
+URL: https://github.com/shannah/Java-Objective-C-Bridge
+Downloaded From:
+  https://repo1.maven.org/maven2/ca/weblite/java-objc-bridge/1.1/java-objc-bridge-1.1.jar
+  https://repo1.maven.org/maven2/ca/weblite/java-objc-bridge/1.1/java-objc-bridge-1.1-sources.jar
+  https://repo1.maven.org/maven2/ca/weblite/java-objc-bridge/1.1/java-objc-bridge-1.1-javadoc.jar
 License: Apache 2.0
-Description: JNA library to allow Java programs to invoke Objective-C APIs
 Instructions:
-    brew install maven
-    brew install gpg
-    gpg --gen-key
-    git clone https://github.com/shannah/Java-Objective-C-Bridge.git
-    cd Java-Objective-C-Bridge
-    Edit pom.xml (or apply patch.diff)
-        Change <maven.compiler.target> to version 8
-        Change <maven.compiler.source> to version 8
-    mvn clean install -Drelease=true
+  Download jars
+  Run jar xf java-objc-bridge-1.1.jar
+  Delete folders ca and META-INF
+  Delete files Application.xib, Info.plist and Window.xib

third-party/java/ObjCBridge/libjcocoa.dylib.dSYM/Contents/Info.plist

@@ -5,7 +5,7 @@
 		<key>CFBundleDevelopmentRegion</key>
 		<string>English</string>
 		<key>CFBundleIdentifier</key>
-		<string>com.apple.xcode.dsym.libjcocoa.dylib</string>
+		<string>com.apple.xcode.dsym.$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 		<key>CFBundleInfoDictionaryVersion</key>
 		<string>6.0</string>
 		<key>CFBundlePackageType</key>
@@ -15,6 +15,6 @@
 		<key>CFBundleShortVersionString</key>
 		<string>1.0</string>
 		<key>CFBundleVersion</key>
-		<string>1</string>
+		<string>11.0.2</string>
 	</dict>
 </plist>

third-party/java/jna/BUCK

@@ -1,19 +1,19 @@
 prebuilt_jar(
     name = "jna",
-    binary_jar = "jna-5.6.0.jar",
+    binary_jar = "jna-5.7.0.jar",
     licenses = [
         "LICENSE",
     ],
-    source_jar = "jna-5.6.0-sources.jar",
+    source_jar = "jna-5.7.0-sources.jar",
     visibility = ["PUBLIC"],
 )
 
 prebuilt_jar(
     name = "jna-platform",
-    binary_jar = "jna-platform-5.6.0.jar",
+    binary_jar = "jna-platform-5.7.0.jar",
     licenses = [
         "LICENSE",
     ],
-    source_jar = "jna-platform-5.6.0-sources.jar",
+    source_jar = "jna-platform-5.7.0-sources.jar",
     visibility = ["PUBLIC"],
 )

third-party/java/jna/README.facebook

@@ -2,6 +2,6 @@ README for JNA
 
 URL: https://github.com/java-native-access/jna
 Downloaded From:
-  https://search.maven.org/artifact/net.java.dev.jna/jna/5.6.0/jar
-  https://search.maven.org/artifact/net.java.dev.jna/jna-platform/5.6.0/jar
+  https://search.maven.org/artifact/net.java.dev.jna/jna/5.7.0/jar
+  https://search.maven.org/artifact/net.java.dev.jna/jna-platform/5.7.0/jar
 License: Apache 2.0 and LPGL 2.1 dual license

third-party/java/sqlite/BUCK

@@ -1,10 +1,10 @@
 prebuilt_jar(
     name = "sqlite",
-    binary_jar = "sqlite-jdbc-3.20.0.jar",
+    binary_jar = "sqlite-jdbc-3.34.0.jar",
     licenses = [
         "LICENSE.txt",
     ],
-    source_jar = "sqlite-jdbc-3.20.0-sources.jar",
+    source_jar = "sqlite-jdbc-3.34.0-sources.jar",
     visibility = [
         "PUBLIC",
     ],

third-party/java/sqlite/README.facebook

@@ -2,5 +2,5 @@ README for sqlite-jdbc
 
 URL: https://github.com/xerial/sqlite-jdbc/
 Downloaded From:
-  http://central.maven.org/maven2/org/xerial/sqlite-jdbc/3.20.0/
+  http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.34.0/
 License: Apache 2.0

third-party/java/sqlite/fetch.sh

@@ -1,21 +1,22 @@
 #!/bin/sh
 
-BIN_FILENAME="sqlite-jdbc-3.20.0.jar"
-BIN_URL="http://central.maven.org/maven2/org/xerial/sqlite-jdbc/3.20.0/sqlite-jdbc-3.20.0.jar"
-BIN_HASH="143b1c0a453c9a8f77be14209ea15391d1e0eb93348fcfabf03cc227b0edae73"
-SOURCE_FILENAME="sqlite-jdbc-3.20.0-sources.jar"
-SOURCE_URL="http://central.maven.org/maven2/org/xerial/sqlite-jdbc/3.20.0/sqlite-jdbc-3.20.0-sources.jar"
-SOURCE_HASH="db6a12de3990dac9eb5af4f97d01e160f0c875bdad88a5e28aee39467d915f4b"
+VERSION="3.34.0"
+BIN_FILENAME="sqlite-jdbc-$VERSION.jar"
+BIN_URL="https://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/$VERSION/sqlite-jdbc-$VERSION.jar"
+BIN_HASH="fd29bb0124e3f79c80b2753162a6a3873c240bcf"
+SOURCE_FILENAME="sqlite-jdbc-$VERSION-sources.jar"
+SOURCE_URL="https://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/$VERSION/sqlite-jdbc-$VERSION-sources.jar"
+SOURCE_HASH="9d5be0d6ec51a77bec54f4e513ac739e462c830a"
 
 wget "$BIN_URL" -O "$BIN_FILENAME"
-REAL_BIN_HASH=$(shasum -a 256 "$BIN_FILENAME" | awk {'print $1'})
+REAL_BIN_HASH=$(shasum -a 1 "$BIN_FILENAME" | awk {'print $1'})
 if [ "$REAL_BIN_HASH" != "$BIN_HASH" ]; then
   echo "File from ${BIN_URL} has hash ${REAL_BIN_HASH}, expected ${BIN_HASH}"
   exit 1
 fi
 
 wget "$SOURCE_URL" -O "$SOURCE_FILENAME"
-REAL_SOURCE_HASH=$(shasum -a 256 "$SOURCE_FILENAME" | awk {'print $1'})
+REAL_SOURCE_HASH=$(shasum -a 1 "$SOURCE_FILENAME" | awk {'print $1'})
 if [ "$REAL_SOURCE_HASH" != "$SOURCE_HASH" ]; then
   echo "File from ${SOURCE_URL} has hash ${REAL_SOURCE_HASH}, expected ${SOURCE_HASH}"
   exit 1
@@ -24,6 +25,5 @@ fi
 zip -d "$BIN_FILENAME" "org/sqlite/native/FreeBSD/x86_64/libsqlitejdbc.so"
 zip -d "$BIN_FILENAME" "org/sqlite/native/Linux/android-arm/libsqlitejdbc.so"
 zip -d "$BIN_FILENAME" "org/sqlite/native/Linux/arm/libsqlitejdbc.so"
-zip -d "$BIN_FILENAME" "org/sqlite/native/Linux/armv6/libsqlitejdbc.so"
 zip -d "$BIN_FILENAME" "org/sqlite/native/Linux/armv7/libsqlitejdbc.so"
 zip -d "$BIN_FILENAME" "org/sqlite/native/Linux/ppc64/libsqlitejdbc.so"