Merge branch 'main' into pr_swift_package_manager_support

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
         run: yarn build
         working-directory: website
       - name: Deploy
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

CONTRIBUTING.md

@@ -8,7 +8,7 @@ Facebook has adopted a Code of Conduct that we expect project participants to ad
 
 ## Pull Requests
 We actively welcome your pull requests.
-1. Fork the repo and create your branch from `master`.
+1. Fork the repo and create your branch from `main`.
 2. If you've added code that should be tested, add tests
 3. If you've changed APIs, update the documentation.
 4. Ensure the test suite passes.

YogaKit/BUCK

@@ -42,6 +42,7 @@ yoga_apple_library(
         "$SDKROOT/System/Library/Frameworks/UIKit.framework",
     ],
     header_path_prefix = "",
+    labels = ["skip_module_validation"],
     link_whole = True,
     modular = True,
     module_name = "YogaKit",

YogaKit/README.md

@@ -14,9 +14,9 @@ pod 'YogaKit', '~> 1.7'
 ## Getting Started
 Checkout the docs [here](https://facebook.github.io/yoga/docs/api/yogakit/).
 
-We also have a sample project. To try it out, clone this repo and open `YogaKitSample.xcodeproj` in the [YogaKitSample](https://github.com/facebook/yoga/tree/master/YogaKit/YogaKitSample) directory.
+We also have a sample project. To try it out, clone this repo and open `YogaKitSample.xcodeproj` in the [YogaKitSample](https://github.com/facebook/yoga/tree/main/YogaKit/YogaKitSample) directory.
 
 ## Contributing
 We welcome all pull-requests! At Facebook we sync the open source version of `YogaKit` daily, so we're always testing the latest changes.
 
-See the [CONTRIBUTING.md](https://github.com/facebook/yoga/blob/master/CONTRIBUTING.md) file for how to help out.
+See the [CONTRIBUTING.md](https://github.com/facebook/yoga/blob/main/CONTRIBUTING.md) file for how to help out.

gradle.properties

@@ -15,10 +15,10 @@ POM_SCM_URL=https://github.com/facebook/yoga.git
 POM_SCM_CONNECTION=scm:git:https://github.com/facebook/yoga.git
 POM_SCM_DEV_CONNECTION=scm:git:git@github.com:facebook/yoga.git
 POM_LICENSE_NAME=MIT License
-POM_LICENSE_URL=https://github.com/facebook/yoga/blob/master/LICENSE
+POM_LICENSE_URL=https://github.com/facebook/yoga/blob/main/LICENSE
 POM_LICENSE_DIST=repo
 POM_LICENCE_NAME=MIT License
-POM_LICENCE_URL=https://github.com/facebook/yoga/blob/master/LICENSE
+POM_LICENCE_URL=https://github.com/facebook/yoga/blob/main/LICENSE
 POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=facebook
 POM_DEVELOPER_NAME=facebook

java/.cxx/abi_configuration_3x6d4s5q.json

@@ -0,0 +1,14 @@
+{
+  "allAbis": [
+    "armeabi-v7a",
+    "arm64-v8a",
+    "x86",
+    "x86_64"
+  ],
+  "validAbis": [
+    "ARMEABI_V7A",
+    "ARM64_V8A",
+    "X86",
+    "X86_64"
+  ]
+}

java/.cxx/abi_configuration_3x6d4s5q_key.json

@@ -0,0 +1,23 @@
+{
+  "ndkHandlerSupportedAbis": [
+    "ARMEABI_V7A",
+    "ARM64_V8A",
+    "X86",
+    "X86_64"
+  ],
+  "ndkHandlerDefaultAbis": [
+    "ARMEABI_V7A",
+    "ARM64_V8A",
+    "X86",
+    "X86_64"
+  ],
+  "externalNativeBuildAbiFilters": [],
+  "ndkConfigAbiFilters": [
+    "armeabi-v7a",
+    "x86_64",
+    "x86",
+    "arm64-v8a"
+  ],
+  "splitsFilterAbis": [],
+  "ideBuildOnlyTargetAbi": true
+}

java/.cxx/ndk_locator_record_264jk1e2.json

@@ -0,0 +1,11 @@
+{
+  "ndk": "/opt/android_sdk/ndk/21.3.6528147",
+  "revision": {
+    "mMajor": 21,
+    "mMinor": 3,
+    "mMicro": 6528147,
+    "mPreview": 0,
+    "mPrecision": "MICRO",
+    "mPreviewSeparator": " "
+  }
+}

java/.cxx/ndk_locator_record_264jk1e2_key.json

@@ -0,0 +1,9 @@
+{
+  "ndkVersionFromDsl": "21.3.6528147",
+  "sdkFolder": "/opt/android_sdk",
+  "sideBySideNdkFolderNames": [
+    "21.4.7075529",
+    "21.3.6528147",
+    "21.1.6352462"
+  ]
+}

java/BUCK

@@ -3,11 +3,11 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID", "CXX_LIBRARY_WHITELIST", "JNI_TARGET", "JSR_305_TARGET", "JUNIT_TARGET", "PROGUARD_ANNOTATIONS_TARGET", "SOLOADER_TARGET", "YOGA_ROOTS", "yoga_cxx_lib", "yoga_cxx_library", "yoga_dep", "yoga_java_binary", "yoga_java_library", "yoga_java_test", "yoga_prebuilt_cxx_library")
+load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID", "CXX_LIBRARY_WHITELIST", "JNI_TARGET", "JSR_305_TARGET", "JUNIT_TARGET", "PROGUARD_ANNOTATIONS_TARGET", "SOLOADER_TARGET", "YOGA_ROOTS", "yoga_android_dep", "yoga_cxx_library", "yoga_dep", "yoga_java_binary", "yoga_java_library", "yoga_java_test", "yoga_prebuilt_cxx_library")
 
 CXX_LIBRARY_WHITELIST_FOR_TESTS = CXX_LIBRARY_WHITELIST + [
-    yoga_cxx_lib("testutil:jni"),
+    yoga_android_dep("testutil:jni"),
-    yoga_cxx_lib("testutil:testutil-jni"),
+    yoga_android_dep("testutil:testutil-jni"),
 ]
 
 YOGA_JAVA_IMPLEMENTATION_FILES = [

lib/fb/.cxx/abi_configuration_3x6d4s5q.json

@@ -0,0 +1,14 @@
+{
+  "allAbis": [
+    "armeabi-v7a",
+    "arm64-v8a",
+    "x86",
+    "x86_64"
+  ],
+  "validAbis": [
+    "ARMEABI_V7A",
+    "ARM64_V8A",
+    "X86",
+    "X86_64"
+  ]
+}

lib/fb/.cxx/abi_configuration_3x6d4s5q_key.json

@@ -0,0 +1,23 @@
+{
+  "ndkHandlerSupportedAbis": [
+    "ARMEABI_V7A",
+    "ARM64_V8A",
+    "X86",
+    "X86_64"
+  ],
+  "ndkHandlerDefaultAbis": [
+    "ARMEABI_V7A",
+    "ARM64_V8A",
+    "X86",
+    "X86_64"
+  ],
+  "externalNativeBuildAbiFilters": [],
+  "ndkConfigAbiFilters": [
+    "armeabi-v7a",
+    "x86_64",
+    "x86",
+    "arm64-v8a"
+  ],
+  "splitsFilterAbis": [],
+  "ideBuildOnlyTargetAbi": true
+}

lib/fb/.cxx/ndk_locator_record_2w3j676q.json

@@ -0,0 +1,11 @@
+{
+  "ndk": "/opt/android_sdk/ndk/21.4.7075529",
+  "revision": {
+    "mMajor": 21,
+    "mMinor": 4,
+    "mMicro": 7075529,
+    "mPreview": 0,
+    "mPrecision": "MICRO",
+    "mPreviewSeparator": " "
+  }
+}

lib/fb/.cxx/ndk_locator_record_2w3j676q_key.json

@@ -0,0 +1,8 @@
+{
+  "sdkFolder": "/opt/android_sdk",
+  "sideBySideNdkFolderNames": [
+    "21.4.7075529",
+    "21.3.6528147",
+    "21.1.6352462"
+  ]
+}

lib/fb/BUCK

@@ -2,7 +2,8 @@
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
-load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID", "JNI_TARGET", "YOGA_ROOTS", "subdir_glob", "yoga_cxx_library", "yoga_prebuilt_cxx_library")
+load("@fbsource//tools/build_defs:platform_defs.bzl", "ANDROID", "APPLE", "CXX", "FBCODE", "WINDOWS")
+load("//tools/build_defs/oss:yoga_defs.bzl", "JNI_TARGET", "YOGA_ROOTS", "subdir_glob", "yoga_cxx_library", "yoga_prebuilt_cxx_library")
 
 yoga_prebuilt_cxx_library(
     name = "ndklog",
@@ -13,6 +14,7 @@ yoga_prebuilt_cxx_library(
         ),
     ],
     header_only = True,
+    platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
     visibility = YOGA_ROOTS,
 )
 

testutil/.cxx/abi_configuration_3x6d4s5q.json

@@ -0,0 +1,14 @@
+{
+  "allAbis": [
+    "armeabi-v7a",
+    "arm64-v8a",
+    "x86",
+    "x86_64"
+  ],
+  "validAbis": [
+    "ARMEABI_V7A",
+    "ARM64_V8A",
+    "X86",
+    "X86_64"
+  ]
+}

testutil/.cxx/abi_configuration_3x6d4s5q_key.json

@@ -0,0 +1,23 @@
+{
+  "ndkHandlerSupportedAbis": [
+    "ARMEABI_V7A",
+    "ARM64_V8A",
+    "X86",
+    "X86_64"
+  ],
+  "ndkHandlerDefaultAbis": [
+    "ARMEABI_V7A",
+    "ARM64_V8A",
+    "X86",
+    "X86_64"
+  ],
+  "externalNativeBuildAbiFilters": [],
+  "ndkConfigAbiFilters": [
+    "armeabi-v7a",
+    "x86_64",
+    "x86",
+    "arm64-v8a"
+  ],
+  "splitsFilterAbis": [],
+  "ideBuildOnlyTargetAbi": true
+}

testutil/.cxx/ndk_locator_record_2w3j676q.json

@@ -0,0 +1,11 @@
+{
+  "ndk": "/opt/android_sdk/ndk/21.4.7075529",
+  "revision": {
+    "mMajor": 21,
+    "mMinor": 4,
+    "mMicro": 7075529,
+    "mPreview": 0,
+    "mPrecision": "MICRO",
+    "mPreviewSeparator": " "
+  }
+}

testutil/.cxx/ndk_locator_record_2w3j676q_key.json

@@ -0,0 +1,8 @@
+{
+  "sdkFolder": "/opt/android_sdk",
+  "sideBySideNdkFolderNames": [
+    "21.4.7075529",
+    "21.3.6528147",
+    "21.1.6352462"
+  ]
+}

website/contents/getting-started/standalone.md

@@ -27,7 +27,7 @@ $> yarn add yoga-layout
 ```
 
 This is an example on how to use Yoga in JavaScript, for a full API reference,
-have a look at the [flow-type definitions](https://github.com/facebook/yoga/blob/master/javascript/sources/entry-common.js#L123).
+have a look at the [flow-type definitions](https://github.com/facebook/yoga/blob/main/javascript/sources/entry-common.js#L123).
 
 ```js
 import yoga, {Node} from 'yoga-layout';

yogacore/.cxx/abi_configuration_4s14e3o2.json

@@ -0,0 +1,14 @@
+{
+  "allAbis": [
+    "armeabi-v7a",
+    "arm64-v8a",
+    "x86",
+    "x86_64"
+  ],
+  "validAbis": [
+    "ARMEABI_V7A",
+    "ARM64_V8A",
+    "X86",
+    "X86_64"
+  ]
+}

yogacore/.cxx/abi_configuration_4s14e3o2_key.json

@@ -0,0 +1,18 @@
+{
+  "ndkHandlerSupportedAbis": [
+    "ARMEABI_V7A",
+    "ARM64_V8A",
+    "X86",
+    "X86_64"
+  ],
+  "ndkHandlerDefaultAbis": [
+    "ARMEABI_V7A",
+    "ARM64_V8A",
+    "X86",
+    "X86_64"
+  ],
+  "externalNativeBuildAbiFilters": [],
+  "ndkConfigAbiFilters": [],
+  "splitsFilterAbis": [],
+  "ideBuildOnlyTargetAbi": true
+}

yogacore/.cxx/ndk_locator_record_2w3j676q.json

@@ -0,0 +1,11 @@
+{
+  "ndk": "/opt/android_sdk/ndk/21.4.7075529",
+  "revision": {
+    "mMajor": 21,
+    "mMinor": 4,
+    "mMicro": 7075529,
+    "mPreview": 0,
+    "mPrecision": "MICRO",
+    "mPreviewSeparator": " "
+  }
+}

yogacore/.cxx/ndk_locator_record_2w3j676q_key.json

@@ -0,0 +1,8 @@
+{
+  "sdkFolder": "/opt/android_sdk",
+  "sideBySideNdkFolderNames": [
+    "21.4.7075529",
+    "21.3.6528147",
+    "21.1.6352462"
+  ]
+}