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

Commit a2912b9

Browse files
milendfacebook-github-bot
authored andcommitted
Update packages for compatibility with macOS 11 Big Sur
Summary: # Context macOS 11 adopts the [dyld shared cache](https://iphonedevwiki.net/index.php/Dyld_shared_cache) which means that the system libraries do not actually exist on the filesystem. This broke JNA and it was fixed in late June 2020 ([issue#1215](java-native-access/jna#1215)). # Changes Because we have other third-party JARs which depend on JNA, we had to update those. In summary, we updated all of the following modules: - JNA - nailgun - NuProcess - oshi - Java Obj-C Bridge Reviewed By: blackm00n fbshipit-source-id: f29c775912ac3a84ec5615f6999b7bccf212ead7
1 parent bae1f42 commit a2912b9

Some content is hidden

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

48 files changed

+119
-53
lines changed

.idea/libraries/buck_lib.xml

Lines changed: 7 additions & 7 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_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.

build.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
<include name="jackson/jackson-module-kotlin-2.9.9.jar" />
127127
<include name="kotlin/kotlin-reflect.jar" />
128128
<include name="android/sdklib-25.3.0.jar" />
129-
<include name="nailgun/nailgun-server-1.0.0.jar" />
130-
<include name="jna/jna-4.5.1.jar" />
131-
<include name="jna/jna-platform-4.5.1.jar" />
129+
<include name="nailgun/nailgun-server-1.0.1.jar" />
130+
<include name="jna/jna-5.6.0.jar" />
131+
<include name="jna/jna-platform-5.6.0.jar" />
132132
<include name="sqlite/sqlite-jdbc-3.20.0.jar" />
133133
<include name="remote-apis/remote-apis.jar" />
134134
</fileset>
@@ -141,7 +141,7 @@
141141

142142
<fileset dir="${third-party.dir}/java" id="third-party.jars">
143143
<patternset refid="third-party.jars.private"/>
144-
<include name="ObjCBridge/ObjCBridge.jar" />
144+
<include name="ObjCBridge/java-objc-bridge-1.1-SNAPSHOT.jar" />
145145
<include name="aapt2-proto/aapt2-proto-0.4.0.jar" />
146146
<include name="android/common-25.3.0.jar" />
147147
<include name="android/layoutlib-api-25.3.0.jar" />
@@ -204,14 +204,14 @@
204204
<include name="kotlinx-metadata-jvm/kotlinx-metadata-jvm-0.1.0.jar" />
205205
<include name="jsr/javax.inject-1.jar" />
206206
<include name="jsr/jsr305.jar" />
207-
<include name="nuprocess/nuprocess-1.2.4.jar" />
207+
<include name="nuprocess/nuprocess-2.0.1.jar" />
208208
<include name="objenesis/objenesis-1.2.jar" />
209209
<include name="okhttp/okhttp-3.11.0.jar" />
210210
<include name="okhttp/okhttp-tls-3.11.0.jar" />
211211
<include name="okio/okio-1.13.0.jar" />
212212
<include name="opencensus/opencensus-api-0.24.0.jar" />
213213
<include name="opencensus/opencensus-contrib-grpc-metrics-0.24.0.jar" />
214-
<include name="oshi/oshi-core-3.3-SNAPSHOT.jar" />
214+
<include name="oshi/oshi-core-5.2.5.jar" />
215215
<include name="pf4j/pf4j-2.0.0-SNAPSHOT.jar" />
216216
<include name="protobuf/protobuf-java-3.7.0.jar" />
217217
<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;

src/com/facebook/buck/cli/MainRunner.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241
import com.google.common.util.concurrent.ListenableFuture;
242242
import com.google.common.util.concurrent.ListeningExecutorService;
243243
import com.google.common.util.concurrent.ThreadFactoryBuilder;
244-
import com.sun.jna.Pointer;
244+
import com.sun.jna.Native;
245245
import java.io.BufferedOutputStream;
246246
import java.io.Closeable;
247247
import java.io.FileNotFoundException;
@@ -294,7 +294,7 @@ public final class MainRunner {
294294
*
295295
* <p>See: https://github.com/java-native-access/jna/issues/652
296296
*/
297-
public static final int JNA_POINTER_SIZE = Pointer.SIZE;
297+
public static final int JNA_POINTER_SIZE = Native.POINTER_SIZE;
298298

299299
private static final Optional<String> BUCKD_LAUNCH_TIME_NANOS =
300300
Optional.ofNullable(System.getProperty("buck.buckd_launch_time_nanos"));

src/com/facebook/buck/util/ProcessHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static ProcessHelper getInstance() {
6868
try {
6969
LOG.verbose("Getting process tree...");
7070
OperatingSystem os = OSHI.getOperatingSystem();
71-
OSProcess[] processes = os.getProcesses(100, OperatingSystem.ProcessSort.NEWEST);
71+
List<OSProcess> processes = os.getProcesses(100, OperatingSystem.ProcessSort.NEWEST);
7272
for (OSProcess process : processes) {
7373
tree.add(process);
7474
}

third-party/java/ObjCBridge/BUCK

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
prebuilt_jar(
22
name = "ObjCBridge",
3-
binary_jar = "ObjCBridge.jar",
3+
binary_jar = "java-objc-bridge-1.1-SNAPSHOT.jar",
44
licenses = [
55
"LICENSE",
66
],
7+
source_jar = "java-objc-bridge-1.1-SNAPSHOT-sources.jar",
78
visibility = ["PUBLIC"],
89
deps = [
910
"//third-party/java/jna:jna",
-79.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)