Skip to content
This repository was archived by the owner on Nov 10, 2023. It is now read-only.

Commit 8c2ebf0

Browse files
marcesengelcortinico
marcesengel
authored and
cortinico
committed
feat: support M1 chips
Updated jna, java-objc-bridge, sqlite-jdbc and zstd-jni to supported version Breaks java 8 support due to java-objc-bridge bump shannah/Java-Objective-C-Bridge#41 (comment)
1 parent 16dc486 commit 8c2ebf0

45 files changed

Lines changed: 75 additions & 105 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.idea/libraries/buck_lib.xml‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/jna.xml‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/jna_5_6_0.xml‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/jna_platform.xml‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/jna_platform_5_6_0.xml‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/sqlite.xml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/zstd_jni_1_4_0_1.xml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎buck.iml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@
123123
<orderEntry type="library" name="eden" level="project" />
124124
<orderEntry type="library" name="java-thrift-dependencies" level="project" />
125125
<orderEntry type="library" name="xz-java-1.5" level="project" />
126-
<orderEntry type="library" name="jna-5.6.0" level="project" />
127-
<orderEntry type="library" name="jna-platform-5.6.0" level="project" />
126+
<orderEntry type="library" name="jna-5.7.0" level="project" />
127+
<orderEntry type="library" name="jna-platform-5.7.0" level="project" />
128128
<orderEntry type="library" name="diffutils-1.3.0" level="project" />
129129
<orderEntry type="library" name="okio" level="project" />
130130
<orderEntry type="library" name="okhttp" level="project" />
@@ -150,7 +150,7 @@
150150
<orderEntry type="library" name="aapt2-proto-0.4.0" level="project" />
151151
<orderEntry type="library" name="commons-compress-1.18" level="project" />
152152
<orderEntry type="library" name="apksig" level="project" />
153-
<orderEntry type="library" name="zstd-jni-1.4.0-1" level="project" />
153+
<orderEntry type="library" name="zstd-jni-1.4.9-5" level="project" />
154154
<orderEntry type="library" name="a2api" level="project" />
155155
<orderEntry type="library" name="devspeed.logging" level="project" />
156156
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
@@ -160,4 +160,4 @@
160160
<orderEntry type="library" name="jackson-module-kotlin-2.9.9" level="project" />
161161
<orderEntry type="library" name="log4j2" level="project" />
162162
</component>
163-
</module>
163+
</module>

‎build.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@
153153
<include name="kotlin/kotlin-reflect.jar" />
154154
<include name="android/sdklib-25.3.0.jar" />
155155
<include name="nailgun/nailgun-server-1.0.1.jar" />
156-
<include name="jna/jna-5.6.0.jar" />
157-
<include name="jna/jna-platform-5.6.0.jar" />
158-
<include name="sqlite/sqlite-jdbc-3.20.0.jar" />
156+
<include name="jna/jna-5.7.0.jar" />
157+
<include name="jna/jna-platform-5.7.0.jar" />
158+
<include name="sqlite/sqlite-jdbc-3.34.0.jar" />
159159
<include name="bazel/bazel_deploy.jar" />
160160
<include name="remote-apis/remote-apis.jar" />
161161
</fileset>
@@ -168,7 +168,7 @@
168168

169169
<fileset dir="${third-party.dir}/java" id="third-party.jars">
170170
<patternset refid="third-party.jars.private"/>
171-
<include name="ObjCBridge/java-objc-bridge-1.1-SNAPSHOT.jar" />
171+
<include name="ObjCBridge/java-objc-bridge-1.1.jar" />
172172
<include name="aapt2-proto/aapt2-proto-0.4.0.jar" />
173173
<include name="android/common-25.3.0.jar" />
174174
<include name="android/layoutlib-api-25.3.0.jar" />
@@ -245,7 +245,7 @@
245245
<include name="stringtemplate/ST-4.0.8.jar" />
246246
<include name="thrift/libthrift-0.12.0.jar" />
247247
<include name="xz-java-1.5/xz-1.5.jar" />
248-
<include name="zstd-jni/zstd-jni-1.4.0-1.jar" />
248+
<include name="zstd-jni/zstd-jni-1.4.9-5.jar" />
249249
<include name="remote-apis/remote-apis.jar" />
250250
<include name="log4j2/log4j-api-2.17.1.jar" />
251251
<include name="log4j2/log4j-core-2.17.1.jar" />

‎programs/classpaths‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,16 @@ third-party/java/jackson/jackson-datatype-jdk8-2.9.7.jar
5959
third-party/java/jackson/jackson-module-kotlin-2.9.9.jar
6060
third-party/java/jdom/jdom-2.0.6.jar
6161
third-party/java/jetty/jetty-all-9.4.9.v20180320-uber.jar
62-
third-party/java/jna/jna-5.6.0.jar
63-
third-party/java/jna/jna-platform-5.6.0.jar
62+
third-party/java/jna/jna-5.7.0.jar
63+
third-party/java/jna/jna-platform-5.7.0.jar
6464
third-party/java/jopt-simple/jopt-simple-4.6.jar
6565
third-party/java/json-simple/json-simple-1.1.1.jar
6666
third-party/java/jsr/javax.inject-1.jar
6767
third-party/java/jsr/jsr305.jar
6868
third-party/java/kxml2/kxml2-2.3.0.jar
6969
third-party/java/nailgun/nailgun-server-1.0.1.jar
7070
third-party/java/nuprocess/nuprocess-2.0.1.jar
71-
third-party/java/ObjCBridge/java-objc-bridge-1.1-SNAPSHOT.jar
71+
third-party/java/ObjCBridge/java-objc-bridge-1.1.jar
7272
third-party/java/objenesis/objenesis-1.2.jar
7373
third-party/java/okhttp/okhttp-3.9.0.jar
7474
third-party/java/okio/okio-1.13.0.jar
@@ -80,7 +80,7 @@ third-party/java/protobuf/protobuf-java-3.7.0.jar
8080
third-party/java/protobuf/protobuf-java-util-3.7.0.jar
8181
third-party/java/protobuf/protobuf-lite-3.0.1.jar
8282
third-party/java/slf4j/slf4j-jdk14-1.7.5.jar
83-
third-party/java/sqlite/sqlite-jdbc-3.20.0.jar
83+
third-party/java/sqlite/sqlite-jdbc-3.34.0.jar
8484
third-party/java/stringtemplate/ST-4.0.8.jar
8585
third-party/java/thrift/libthrift-0.12.0.jar
8686
third-party/java/xz-java-1.5/xz-1.5.jar

0 commit comments

Comments
 (0)