Merge branch 'main' into css-grid

Author: intergalacticspacehighway

.github/actions/setup-apple/action.yml

@@ -3,11 +3,6 @@ name: Setup Apple envirionment
 runs:
   using: "composite"
   steps:
-    # TODO: This and Ruby should be versioned
-    - name: Install Cocoapods
-      shell: bash
-      run: sudo gem install cocoapods
-
     - uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: 14.3.1
+        xcode-version: 26.2

.github/workflows/publish-cocoapods-release.yml

@@ -1,4 +1,4 @@
-name: Validate Apple
+name: Validate SwiftPM
 
 on:
   pull_request:
@@ -9,22 +9,9 @@ on:
   workflow_dispatch:
 
 jobs:
-  lint-pods:
-    name: Build [CocoaPods]
-    runs-on: macos-13
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup
-        uses: ./.github/actions/setup-apple
-
-      - name: pod lib lint
-        run: pod lib lint --verbose --include-podspecs=**/*.podspec
-
   test:
-    name: Build [SwiftPM]
-    runs-on: macos-13
+    name: Build
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/validate-apple.yml .github/workflows/validate-swiftpm.yml.github/workflows/validate-apple.yml renamed to .github/workflows/validate-swiftpm.yml

@@ -1,4 +1,4 @@
-# Yoga [![CocoaPods](https://img.shields.io/cocoapods/v/Yoga.svg)](http://cocoapods.org/pods/Yoga) [![npm](https://img.shields.io/npm/v/yoga-layout.svg)](https://www.npmjs.com/package/yoga-layout) [![Maven Central](https://img.shields.io/maven-central/v/com.facebook.yoga/yoga)](https://search.maven.org/artifact/com.facebook.yoga/yoga) ![SPM](https://img.shields.io/badge/SPM-Supported-blue.svg)
+# Yoga [![npm](https://img.shields.io/npm/v/yoga-layout.svg)](https://www.npmjs.com/package/yoga-layout) [![Maven Central](https://img.shields.io/maven-central/v/com.facebook.yoga/yoga)](https://search.maven.org/artifact/com.facebook.yoga/yoga) ![SPM](https://img.shields.io/badge/SPM-Supported-blue.svg)
 
 Yoga is an embeddable and performant flexbox layout engine with bindings for multiple languages.
 

README.md

@@ -91,6 +91,14 @@
     ],
 }
 
+# Temporary filter enums to not upgrade all enums at once
+KOTLIN_ENUM_NAMES = {"Direction"}
+
+ENUMS_KOTLIN = {name: ENUMS[name] for name in KOTLIN_ENUM_NAMES}
+ENUMS_JAVA = {
+    name: values for name, values in ENUMS.items() if name not in KOTLIN_ENUM_NAMES
+}
+
 DO_NOT_STRIP = ["LogLevel"]
 
 BITSET_ENUMS = ["Errata"]
@@ -127,6 +135,10 @@ def to_java_upper(symbol):
     return _format_name(symbol, "_", "upper")
 
 
+def to_kotlin_upper(symbol):
+    return _format_name(symbol, "_", "upper")
+
+
 def to_hyphenated_lower(symbol):
     return _format_name(symbol, "-", "lower")
 
@@ -222,7 +234,7 @@ def to_hyphenated_lower(symbol):
             f.write("\n")
 
 # write out java files
-for name, values in sorted(ENUMS.items()):
+for name, values in sorted(ENUMS_JAVA.items()):
     with open(root + "/java/com/facebook/yoga/Yoga%s.java" % name, "w") as f:
         f.write(get_license("java"))
         f.write("package com.facebook.yoga;\n\n")
@@ -274,6 +286,46 @@ def to_hyphenated_lower(symbol):
         f.write("  }\n")
         f.write("}\n")
 
+# write out Kotlin files
+for name, values in sorted(ENUMS_KOTLIN.items()):
+    with open(root + "/java/com/facebook/yoga/Yoga%s.kt" % name, "w") as f:
+        f.write(get_license("kotlin"))
+        f.write("package com.facebook.yoga\n\n")
+        f.write("public enum class Yoga%s(public val intValue: Int) {\n" % name)
+        if len(values) > 0:
+            for value in values:
+                if isinstance(value, tuple):
+                    f.write("  %s(%d)" % (to_kotlin_upper(value[0]), value[1]))
+                else:
+                    f.write("  %s(%d)" % (to_kotlin_upper(value), values.index(value)))
+                if values.index(value) is len(values) - 1:
+                    f.write(";\n")
+                else:
+                    f.write(",\n")
+        else:
+            f.write("__EMPTY(-1);")
+        f.write("\n")
+        f.write("  public fun intValue(): Int = intValue\n")
+        f.write("\n")
+        f.write("  public companion object {\n")
+        f.write("    @JvmStatic\n")
+        f.write("    public fun fromInt(value: Int): Yoga%s =\n" % name)
+        f.write("        when (value) {\n")
+        for value in values:
+            if isinstance(value, tuple):
+                f.write("          %d -> %s\n" % (value[1], to_kotlin_upper(value[0])))
+            else:
+                f.write(
+                    "          %d -> %s\n"
+                    % (values.index(value), to_kotlin_upper(value))
+                )
+        f.write(
+            '          else -> throw IllegalArgumentException("Unknown enum value: $value")\n'
+        )
+        f.write("        }\n")
+        f.write("  }\n")
+        f.write("}\n")
+
 # write out TypeScript file
 with open(root + "/javascript/src/generated/YGEnums.ts", "w") as f:
     f.write(get_license("js"))

Yoga.podspec

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// @generated by enums.py
+
+package com.facebook.yoga
+
+public enum class YogaDirection(public val intValue: Int) {
+  INHERIT(0),
+  LTR(1),
+  RTL(2);
+
+  public fun intValue(): Int = intValue
+
+  public companion object {
+    @JvmStatic
+    public fun fromInt(value: Int): YogaDirection =
+        when (value) {
+          0 -> INHERIT
+          1 -> LTR
+          2 -> RTL
+          else -> throw IllegalArgumentException("Unknown enum value: $value")
+        }
+  }
+}

enums.py

@@ -35,11 +35,3 @@
     f.seek(0)
     f.truncate()
     f.write(new_contents)
-
-with open("Yoga.podspec", "r+") as f:
-    new_contents = re.sub(
-        r"spec\.version = '.*'", f"spec.version = '{version}'", f.read()
-    )
-    f.seek(0)
-    f.truncate()
-    f.write(new_contents)

java/com/facebook/yoga/YogaDirection.java

@@ -22,11 +22,7 @@ export type Props = Readonly<{
   style?: React.CSSProperties;
 }>;
 
-export default function EditorToolbar({
-  code,
-  className,
-  style,
-}: Props): JSX.Element {
+export default function EditorToolbar({code, className, style}: Props) {
   const handleShare = useCallback(() => {
     navigator.clipboard.writeText(
       window.location.origin +
@@ -47,11 +43,7 @@ type ToolbarButtonProps = Readonly<{
   label?: string;
 }>;
 
-function ToolbarButton({
-  onClick,
-  Icon,
-  label,
-}: ToolbarButtonProps): JSX.Element {
+function ToolbarButton({onClick, Icon, label}: ToolbarButtonProps) {
   const [isSuccess, setIsSuccess] = useState(false);
   const copyTimeout = useRef<number | undefined>(undefined);