@shopify/react-native-skia 1.4.1 → 1.4.2

package/android/cpp/jni/JniSkiaManager.cpp

@@ -9,7 +9,7 @@
 
 namespace {
 
-#ifdef REACT_NATIVE_VERSION >= 75
+#if REACT_NATIVE_VERSION >= 75
 using CallFuncType = facebook::react::CallFunc;
 #else
 using CallFuncType = std::function<void()>;

package/android/cpp/rnskia-android/GrAHardwareBufferUtils.cpp

@@ -11,10 +11,10 @@
 #define GL_GLEXT_PROTOTYPES
 #define EGL_EGLEXT_PROTOTYPES
 
-#include "include/gpu/GrBackendSurface.h"
-#include "include/gpu/GrDirectContext.h"
+#include "include/gpu/ganesh/GrBackendSurface.h"
+#include "include/gpu/ganesh/GrDirectContext.h"
 #include "include/gpu/ganesh/gl/GrGLBackendSurface.h"
-#include "include/gpu/gl/GrGLTypes.h"
+#include "include/gpu/ganesh/gl/GrGLTypes.h"
 #include "src/gpu/ganesh/gl/GrGLDefines.h"
 // #include "src/gpu/ganesh/GrDirectContextPriv.h"
 // #include "src/gpu/ganesh/gl/GrGLUtil.h"

package/android/cpp/rnskia-android/GrAHardwareBufferUtils.h

@@ -6,8 +6,8 @@
 
 #if __ANDROID_API__ >= 26
 
-#include "include/gpu/GrBackendSurface.h"
-#include "include/gpu/GrTypes.h"
+#include "include/gpu/ganesh/GrBackendSurface.h"
+#include "include/gpu/ganesh/GrTypes.h"
 
 class GrDirectContext;
 

package/android/cpp/rnskia-android/SkiaOpenGLHelper.h

@@ -15,9 +15,9 @@
 #include "include/core/SkCanvas.h"
 #include "include/core/SkColorSpace.h"
 #include "include/core/SkSurface.h"
-#include "include/gpu/GrDirectContext.h"
+#include "include/gpu/ganesh/GrDirectContext.h"
 #include "include/gpu/ganesh/gl/GrGLDirectContext.h"
-#include "include/gpu/gl/GrGLInterface.h"
+#include "include/gpu/ganesh/gl/GrGLInterface.h"
 
 #pragma clang diagnostic pop
 

package/android/cpp/rnskia-android/SkiaOpenGLSurfaceFactory.h

@@ -22,10 +22,10 @@
 #include "include/core/SkCanvas.h"
 #include "include/core/SkColorSpace.h"
 #include "include/core/SkSurface.h"
-#include "include/gpu/GrBackendSurface.h"
-#include "include/gpu/GrDirectContext.h"
+#include "include/gpu/ganesh/GrBackendSurface.h"
+#include "include/gpu/ganesh/GrDirectContext.h"
 #include "include/gpu/ganesh/SkSurfaceGanesh.h"
-#include "include/gpu/gl/GrGLInterface.h"
+#include "include/gpu/ganesh/gl/GrGLInterface.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkSurface.h

@@ -14,7 +14,7 @@
 #pragma clang diagnostic ignored "-Wdocumentation"
 
 #include "include/core/SkSurface.h"
-#include "include/gpu/GrDirectContext.h"
+#include "include/gpu/ganesh/GrDirectContext.h"
 
 #pragma clang diagnostic pop
 

package/ios/RNSkia-iOS/RNSkMetalCanvasProvider.h

@@ -9,7 +9,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#import <include/gpu/GrDirectContext.h>
+#import <include/gpu/ganesh/GrDirectContext.h>
 
 #pragma clang diagnostic pop
 

package/ios/RNSkia-iOS/RNSkMetalCanvasProvider.mm

@@ -9,8 +9,8 @@
 #import "include/core/SkColorSpace.h"
 #import "include/core/SkSurface.h"
 
-#import <include/gpu/GrBackendSurface.h>
-#import <include/gpu/GrDirectContext.h>
+#import <include/gpu/ganesh/GrBackendSurface.h>
+#import <include/gpu/ganesh/GrDirectContext.h>
 #import <include/gpu/ganesh/SkSurfaceGanesh.h>
 
 #pragma clang diagnostic pop

package/ios/RNSkia-iOS/SkiaCVPixelBufferUtils.h

@@ -17,8 +17,8 @@
 #pragma clang diagnostic ignored "-Wdocumentation"
 #import "include/core/SkColorSpace.h"
 #import "include/core/SkImage.h"
-#import "include/gpu/GrBackendSurface.h"
-#import "include/gpu/GrYUVABackendTextures.h"
+#import "include/gpu/ganesh/GrBackendSurface.h"
+#import "include/gpu/ganesh/GrYUVABackendTextures.h"
 #pragma clang diagnostic pop
 
 /**

package/ios/RNSkia-iOS/SkiaCVPixelBufferUtils.mm

@@ -11,7 +11,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 #import "include/core/SkColorSpace.h"
-#import <include/gpu/GrBackendSurface.h>
+#import <include/gpu/ganesh/GrBackendSurface.h>
 #import <include/gpu/ganesh/SkImageGanesh.h>
 #import <include/gpu/ganesh/mtl/GrMtlBackendContext.h>
 #import <include/gpu/ganesh/mtl/GrMtlBackendSurface.h>

package/ios/RNSkia-iOS/SkiaMetalSurfaceFactory.h

@@ -11,7 +11,7 @@
 #import "include/core/SkCanvas.h"
 #import <CoreMedia/CMSampleBuffer.h>
 #import <CoreVideo/CVMetalTextureCache.h>
-#import <include/gpu/GrDirectContext.h>
+#import <include/gpu/ganesh/GrDirectContext.h>
 
 #pragma clang diagnostic pop
 

package/ios/RNSkia-iOS/SkiaMetalSurfaceFactory.mm

@@ -10,8 +10,8 @@
 #import "include/core/SkColorSpace.h"
 #import "include/core/SkSurface.h"
 
-#import <include/gpu/GrBackendSurface.h>
-#import <include/gpu/GrDirectContext.h>
+#import <include/gpu/ganesh/GrBackendSurface.h>
+#import <include/gpu/ganesh/GrDirectContext.h>
 #import <include/gpu/ganesh/SkImageGanesh.h>
 #import <include/gpu/ganesh/SkSurfaceGanesh.h>
 #import <include/gpu/ganesh/mtl/GrMtlBackendContext.h>

package/libs/ios/libskunicode_core.xcframework/Info.plist

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AvailableLibraries</key>
+	<array>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libskunicode_core.a</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_arm64e</string>
+			<key>LibraryPath</key>
+			<string>libskunicode_core.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>arm64e</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libskunicode_core.a</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>libskunicode_core.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>arm64e</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
+	</array>
+	<key>CFBundlePackageType</key>
+	<string>XFWK</string>
+	<key>XCFrameworkFormatVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>

package/libs/ios/libskunicode_libgrapheme.xcframework/Info.plist

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AvailableLibraries</key>
+	<array>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libskunicode_libgrapheme.a</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_arm64e</string>
+			<key>LibraryPath</key>
+			<string>libskunicode_libgrapheme.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>arm64e</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libskunicode_libgrapheme.a</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>libskunicode_libgrapheme.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>arm64e</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
+	</array>
+	<key>CFBundlePackageType</key>
+	<string>XFWK</string>
+	<key>XCFrameworkFormatVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>

package/package.json

@@ -7,7 +7,7 @@
     "setup-skia-web": "./scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",
@@ -29,13 +29,7 @@
     "jestEnv.mjs",
     "cpp/**/*.{h,cpp}",
     "ios/**",
-    "libs/ios/libskia.xcframework/**",
-    "libs/ios/libskshaper.xcframework/**",
-    "libs/ios/libsvg.xcframework/**",
-    "libs/ios/libskottie.xcframework/**",
-    "libs/ios/libsksg.xcframework/**",
-    "libs/ios/libskparagraph.xcframework/**",
-    "libs/ios/libskunicode.xcframework/**",
+    "libs/ios/*.xcframework/**",
     "react-native-skia.podspec",
     "scripts/setup-canvaskit.js",
     "dist/**"

package/react-native-skia.podspec

@@ -12,11 +12,12 @@ Pod::Spec.new do |s|
                   @shopify/react-native-skia
                    DESC
   s.homepage     = "https://github.com/shopify/react-native-skia"
-  # brief license entry:
   s.license      = "MIT"
-  # optional - use expanded license entry instead:
-  # s.license    = { :type => "MIT", :file => "LICENSE" }
-  s.authors      = { "Your Name" => "yourname@email.com" }
+  s.license    = { :type => "MIT", :file => "LICENSE.md" }
+  s.authors      = { 
+    "Christian Falch" => "christian.falch@gmail.com",
+    "William Candillon" => "wcandillon@gmail.com"
+  }
   s.platforms    = { :ios => "13.0" }
   s.source       = { :git => "https://github.com/shopify/react-native-skia/react-native-skia.git", :tag => "#{s.version}" }
 

package/cpp/skia/include/gpu/GrBackendSemaphore.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/GrBackendSemaphore.h"

package/cpp/skia/include/gpu/GrBackendSurface.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/GrBackendSurface.h"

package/cpp/skia/include/gpu/GrContextOptions.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/GrContextOptions.h"

package/cpp/skia/include/gpu/GrContextThreadSafeProxy.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2019 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/GrContextThreadSafeProxy.h"

package/cpp/skia/include/gpu/GrDirectContext.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/GrDirectContext.h"

package/cpp/skia/include/gpu/GrDriverBugWorkarounds.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2018 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/GrDriverBugWorkarounds.h"

package/cpp/skia/include/gpu/GrDriverBugWorkaroundsAutogen.h

@@ -1,6 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/GrDriverBugWorkaroundsAutogen.h"

package/cpp/skia/include/gpu/GrRecordingContext.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2019 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/GrRecordingContext.h"

package/cpp/skia/include/gpu/GrTypes.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/GrTypes.h"

package/cpp/skia/include/gpu/GrYUVABackendTextures.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2020 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/GrYUVABackendTextures.h"

package/cpp/skia/include/gpu/d3d/GrD3DBackendContext.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2020 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/d3d/GrD3DBackendContext.h"

package/cpp/skia/include/gpu/d3d/GrD3DTypes.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2020 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/d3d/GrD3DTypes.h"

package/cpp/skia/include/gpu/gl/GrGLAssembleHelpers.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2019 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/gl/GrGLAssembleHelpers.h"

package/cpp/skia/include/gpu/gl/GrGLAssembleInterface.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/gl/GrGLAssembleInterface.h"

package/cpp/skia/include/gpu/gl/GrGLConfig.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/gl/GrGLConfig.h"

package/cpp/skia/include/gpu/gl/GrGLExtensions.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/gl/GrGLExtensions.h"

package/cpp/skia/include/gpu/gl/GrGLFunctions.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/gl/GrGLFunctions.h"

package/cpp/skia/include/gpu/gl/GrGLInterface.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/gl/GrGLInterface.h"

package/cpp/skia/include/gpu/gl/GrGLTypes.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/gl/GrGLTypes.h"

package/cpp/skia/include/gpu/mock/GrMockTypes.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/mock/GrMockTypes.h"

package/cpp/skia/include/gpu/vk/GrVkTypes.h

@@ -1,8 +0,0 @@
-/*
- * Copyright 2016 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-// TODO(kjlubick, egdaniel) Delete this after migrating clients.
-#include "include/gpu/ganesh/vk/GrVkTypes.h"