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

Commit 2f85dfc

Browse files
jasonnamjasonnam
authored
Update dependencies for Big Sur (#2580)
* Update JNA to resolve framework loading issue on Big Sur java-native-access/jna#1215 * Remove workaround initializing JNA early java-native-access/jna#652 This issue was resolved and property SIZE does not exist with JNA version 5.6.0. * Update NuProcess to 2.0.1 for compatibility with JNA * Build NuProcess with openjdk version "1.8.0_275" jetty/jetty.project#3244 * Cherry pick a2912b9 a2912b9
1 parent 97e1ef7 commit 2f85dfc

Some content is hidden

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

52 files changed

+139
-73
lines changed

‎.idea/libraries/buck_lib.xml‎

Lines changed: 11 additions & 11 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: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/jna_4_5_1.xml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.idea/libraries/jna_5_6_0.xml‎

Lines changed: 11 additions & 0 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: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/jna_platform_4_5_1.xml renamed to .idea/libraries/jna_platform_5_6_0.xml

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

‎buck.iml‎

Lines changed: 2 additions & 2 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-4.5.1" level="project" />
127-
<orderEntry type="library" name="jna-platform-4.5.1" 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" />
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" />

‎build.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@
152152
<include name="jackson/jackson-module-kotlin-2.9.9.jar" />
153153
<include name="kotlin/kotlin-reflect.jar" />
154154
<include name="android/sdklib-25.3.0.jar" />
155-
<include name="nailgun/nailgun-server-1.0.0.jar" />
156-
<include name="jna/jna-4.5.1.jar" />
157-
<include name="jna/jna-platform-4.5.1.jar" />
155+
<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" />
158158
<include name="sqlite/sqlite-jdbc-3.20.0.jar" />
159159
<include name="bazel/bazel_deploy.jar" />
160160
<include name="remote-apis/remote-apis.jar" />
@@ -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/ObjCBridge.jar" />
171+
<include name="ObjCBridge/java-objc-bridge-1.1-SNAPSHOT.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" />
@@ -229,14 +229,14 @@
229229
<include name="kotlinx-metadata-jvm/kotlinx-metadata-jvm-0.1.0.jar" />
230230
<include name="jsr/javax.inject-1.jar" />
231231
<include name="jsr/jsr305.jar" />
232-
<include name="nuprocess/nuprocess-1.2.4.jar" />
232+
<include name="nuprocess/nuprocess-2.0.1.jar" />
233233
<include name="objenesis/objenesis-1.2.jar" />
234234
<include name="okhttp/okhttp-3.11.0.jar" />
235235
<include name="okhttp/okhttp-tls-3.11.0.jar" />
236236
<include name="okio/okio-1.13.0.jar" />
237237
<include name="opencensus/opencensus-api-0.24.0.jar" />
238238
<include name="opencensus/opencensus-contrib-grpc-metrics-0.24.0.jar" />
239-
<include name="oshi/oshi-core-3.3-SNAPSHOT.jar" />
239+
<include name="oshi/oshi-core-5.2.5.jar" />
240240
<include name="pf4j/pf4j-2.0.0-SNAPSHOT.jar" />
241241
<include name="protobuf/protobuf-java-3.7.0.jar" />
242242
<include name="protobuf/protobuf-java-util-3.7.0.jar" />

‎programs/classpaths‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,20 @@ 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-4.5.1.jar
63-
third-party/java/jna/jna-platform-4.5.1.jar
62+
third-party/java/jna/jna-5.6.0.jar
63+
third-party/java/jna/jna-platform-5.6.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
69-
third-party/java/nailgun/nailgun-server-1.0.0.jar
70-
third-party/java/nuprocess/nuprocess-1.2.4.jar
71-
third-party/java/ObjCBridge/ObjCBridge.jar
69+
third-party/java/nailgun/nailgun-server-1.0.1.jar
70+
third-party/java/nuprocess/nuprocess-2.0.1.jar
71+
third-party/java/ObjCBridge/java-objc-bridge-1.1-SNAPSHOT.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
75-
third-party/java/oshi/oshi-core-3.3-SNAPSHOT.jar
75+
third-party/java/oshi/oshi-core-5.2.5.jar
7676
third-party/java/opencensus/opencensus-api-0.24.0.jar
7777
third-party/java/opencensus/opencensus-contrib-grpc-metrics-0.24.0.jar
7878
third-party/java/pf4j/pf4j-2.0.0-SNAPSHOT.jar

‎src/com/facebook/buck/cli/BuckDaemon.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public final class BuckDaemon {
4848
*
4949
* <p>See: https://github.com/java-native-access/jna/issues/652
5050
*/
51-
public static final int JNA_POINTER_SIZE = Pointer.SIZE;
51+
public static final int JNA_POINTER_SIZE = Native.POINTER_SIZE;
5252

5353
private static final int AFTER_COMMAND_AUTO_GC_DELAY_MS = 5000;
5454
private static final int SUBSEQUENT_GC_DELAY_MS = 10000;

0 commit comments

Comments
 (0)