expo-gl 12.0.0 → 12.1.0

package/CHANGELOG.md

@@ -10,6 +10,17 @@
 
 ### 💡 Others
 
+## 12.1.0 — 2022-12-05
+
+### 🎉 New features
+
+- Migrated the view manager to the new Expo modules API and thus added support for Fabric. ([#19859](https://github.com/expo/expo/pull/19859) by [@tsapeta](https://github.com/tsapeta))
+
+### 🐛 Bug fixes
+
+- Fixed build errors when testing on React Native nightly builds. ([#19805](https://github.com/expo/expo/pull/19805) by [@kudo](https://github.com/kudo))
+- Fixed error for duplicated META-INF files when building on Android. ([#20251](https://github.com/expo/expo/pull/20251) by [@kudo](https://github.com/kudo))
+
 ## 12.0.0 — 2022-10-25
 
 ### 🛠 Breaking changes

package/{EXGL.podspec → ExpoGL.podspec}

@@ -3,7 +3,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name            = 'EXGL'
+  s.name            = 'ExpoGL'
   s.version         = package['version']
   s.summary         = package['description']
   s.description     = package['description']
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
-  s.dependency 'React-jsi'
+  s.dependency 'ReactCommon/turbomodule/core'
 
   s.compiler_flags = '-x objective-c++ -std=c++1z'
   s.pod_target_xcconfig = {
@@ -26,6 +26,8 @@ Pod::Spec.new do |s|
     s.source_files = "ios/**/*.h"
     s.vendored_frameworks = "#{s.name}.xcframework"
   else
-    s.source_files = "ios/**/*.{h,m,mm}", "common/**/*.{h,cpp,def}"
+    s.source_files = "ios/**/*.{h,m,mm,swift}", "common/**/*.{h,cpp,def}"
   end
+
+  s.public_header_files = ['ios/**/*.h', 'common/EXGLNativeApi.h']
 end

package/README.md

@@ -4,7 +4,7 @@ Provides GLView that acts as OpenGL ES render target and gives GL context object
 
 # API documentation
 
-- [Documentation for the main branch](https://github.com/expo/expo/blob/main/docs/pages/versions/unversioned/sdk/gl-view.md)
+- [Documentation for the main branch](https://github.com/expo/expo/blob/main/docs/pages/versions/unversioned/sdk/gl-view.mdx)
 - [Documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/gl-view/)
 
 # Installation in managed Expo projects

package/android/build.gradle

@@ -3,16 +3,26 @@ import java.nio.file.Paths
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
+apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '12.0.0'
-
-def REACT_NATIVE_DIR = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).parent
-def RN_BUILD_FROM_SOURCE = findProject(":ReactAndroid") != null
-def RN_SO_DIR = RN_BUILD_FROM_SOURCE
-    ? Paths.get(findProject(":ReactAndroid").getProjectDir().toString(), "build", "intermediates", "library_*", "*", "jni")
-    : "${buildDir}/react-native-0*/jni"
-def RN_AAR_DIR = "${REACT_NATIVE_DIR}/android"
+version = '12.1.0'
+
+def customDownloadsDir = System.getenv("REACT_NATIVE_DOWNLOADS_DIR")
+def downloadsDir = customDownloadsDir ? new File(customDownloadsDir) : new File("$buildDir/downloads")
+
+def REACT_NATIVE_BUILD_FROM_SOURCE = findProject(":ReactAndroid") != null
+def REACT_NATIVE_DIR = REACT_NATIVE_BUILD_FROM_SOURCE
+  ? findProject(":ReactAndroid").getProjectDir().parent
+  : new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).parent
+def RN_SO_DIR = REACT_NATIVE_BUILD_FROM_SOURCE
+  ? Paths.get(findProject(":ReactAndroid").getProjectDir().toString(), "build", "intermediates", "library_*", "*", "jni")
+  : "${buildDir}/react-native.aar/jni"
+
+def reactProperties = new Properties()
+file("$REACT_NATIVE_DIR/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
+def reactNativeIsNightly = reactProperties.getProperty("VERSION_NAME").startsWith("0.0.0-")
+
 def reactNativeArchitectures() {
     def value = project.getProperties().get("reactNativeArchitectures")
     return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
@@ -45,6 +55,7 @@ buildscript {
 
   dependencies {
     classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
+    classpath("de.undercouch:gradle-download-task:5.3.0")
   }
 }
 
@@ -94,7 +105,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 31
-    versionName "12.0.0"
+    versionName "12.1.0"
 
     externalNativeBuild {
       cmake {
@@ -114,7 +125,7 @@ android {
 
   packagingOptions {
     // Gradle will add cmake target dependencies into packaging.
-    excludes = [
+    excludes += [
         "**/libc++_shared.so",
         "**/libjsi.so",
     ]
@@ -141,27 +152,44 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
 }
 
+def downloadReactNativeNightlyAAR = { buildType, version, downloadFile ->
+  def classifier = buildType == 'Debug' ? 'debug' : 'release'
+  download.run {
+    src("https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=com.facebook.react&a=react-native&c=${classifier}&e=aar&v=${version}-SNAPSHOT")
+    onlyIfNewer(true)
+    overwrite(false)
+    dest(downloadFile)
+  }
+}
+
 def extractReactNativeAAR = { buildType ->
   def suffix = buildType == 'Debug' ? '-debug' : '-release'
-  def rnAARs = fileTree(RN_AAR_DIR).matching { include "**/react-native/**/*${suffix}.aar" }
-  if (rnAARs.isEmpty()) {
-    rnAARs = fileTree(RN_AAR_DIR).matching { include "**/react-native/**/*.aar" }
-  }
-  if (rnAARs.any()) {
-    // node_modules/react-native has a .aar, extract headers
-    if (rnAARs.size() > 1) {
-      logger.error("More than one React Native AAR file has been found:")
-      rnAARs.each {println(it) }
-      throw new GradleException("Multiple React Native AARs found:\n${rnAARs.join("\n")}" +
-          "\nRemove the old ones and try again")
+  def rnAAR
+  if (reactNativeIsNightly) {
+    def downloadFile = file("${downloadsDir}/react-native-nightly.aar")
+    downloadReactNativeNightlyAAR(buildType, reactProperties.getProperty("VERSION_NAME"), downloadFile)
+    rnAAR = downloadFile
+  } else {
+    def rnAARs = fileTree(REACT_NATIVE_DIR).matching { include "**/react-native/**/*${suffix}.aar" }
+    if (rnAARs.isEmpty()) {
+      rnAARs = fileTree(REACT_NATIVE_DIR).matching { include "**/react-native/**/*.aar" }
+    }
+    if (rnAARs.any()) {
+      // node_modules/react-native has a .aar, extract headers
+      if (rnAARs.size() > 1) {
+        logger.error("More than one React Native AAR file has been found:")
+        rnAARs.each {println(it) }
+        throw new GradleException("Multiple React Native AARs found:\n${rnAARs.join("\n")}" +
+            "\nRemove the old ones and try again")
+      }
     }
+    rnAAR = rnAARs.singleFile
   }
-  def rnAAR = rnAARs.singleFile
   def file = rnAAR.absoluteFile
   def packageName = file.name.tokenize('-')[0]
   copy {
     from zipTree(file)
-    into "$buildDir/$file.name"
+    into "$buildDir/react-native.aar"
     include "jni/**/*"
   }
 }
@@ -195,12 +223,12 @@ tasks.whenTaskAdded { task ->
   if (!task.name.contains("Clean") && (task.name.contains('externalNativeBuild') || task.name.startsWith('configureCMake'))) {
     def buildType = task.name.endsWith('Debug') ? 'Debug' : 'Release'
     task.dependsOn(extractJNIFiles)
-    if (RN_BUILD_FROM_SOURCE) {
+    if (REACT_NATIVE_BUILD_FROM_SOURCE) {
       task.dependsOn(":ReactAndroid:copy${buildType}JniLibsProjectOnly")
     } else {
       task.dependsOn("extractReactNativeAAR${buildType}")
     }
-  } else if (task.name.startsWith('generateJsonModel') && RN_BUILD_FROM_SOURCE) {
+  } else if (task.name.startsWith('generateJsonModel') && REACT_NATIVE_BUILD_FROM_SOURCE) {
     def buildType = task.name.endsWith('Debug') ? 'Debug' : 'Release'
     task.dependsOn(":ReactAndroid:copy${buildType}JniLibsProjectOnly")
   }

package/common/EXGLNativeApi.h

@@ -28,11 +28,12 @@ typedef unsigned int EXGLObjectId;
 
 EXGLContextId EXGLContextCreate();
 
-
+#ifdef __cplusplus
 // [JS thread] Create an EXGL context and return its id number. Saves the
 // JavaScript interface object (has a WebGLRenderingContext-style API) at
 // `global.__EXGLContexts[id]` in JavaScript.
 void EXGLContextPrepare(void *runtime, EXGLContextId exglCtxId, std::function<void(void)> flushMethod);
+#endif // __cplusplus
 
 // [Any thread] Check whether we should redraw the surface
 bool EXGLContextNeedsRedraw(EXGLContextId exglCtxId);

package/{unimodule.json → expo-module.config.json}

@@ -2,6 +2,7 @@
   "name": "expo-gl",
   "platforms": ["ios", "android"],
   "ios": {
-    "podspecPath": "./EXGL.podspec"
+    "podspecPath": "./ExpoGL.podspec",
+    "modules": ["GLViewModule"]
   }
 }

package/ios/{EXGL/EXGLCameraObject.h → EXGLCameraObject.h}

@@ -2,8 +2,8 @@
 
 #import <ExpoModulesCore/EXCameraInterface.h>
 
-#import <EXGL/EXGLContext.h>
-#import <EXGL/EXGLObject.h>
+#import <ExpoGL/EXGLContext.h>
+#import <ExpoGL/EXGLObject.h>
 
 @interface EXGLCameraObject : EXGLObject
 

package/ios/{EXGL/EXGLCameraObject.mm → EXGLCameraObject.mm}

@@ -7,8 +7,8 @@
 
 #import <ExpoModulesCore/EXCameraInterface.h>
 
-#import <EXGL/EXGLCameraObject.h>
-#import <EXGL/EXGLContext.h>
+#import <ExpoGL/EXGLCameraObject.h>
+#import <ExpoGL/EXGLContext.h>
 
 @interface EXGLCameraObject () <AVCaptureVideoDataOutputSampleBufferDelegate>
 

package/ios/{EXGL/EXGLContext.h → EXGLContext.h}

@@ -1,7 +1,7 @@
 // Copyright 2016-present 650 Industries. All rights reserved.
 
 #import <OpenGLES/EAGL.h>
-#import <EXGL/EXGLNativeApi.h>
+#import <ExpoGL/EXGLNativeApi.h>
 #import <ExpoModulesCore/EXModuleRegistry.h>
 
 @class EXGLContext;

package/ios/{EXGL/EXGLContext.mm → EXGLContext.mm}

@@ -1,7 +1,7 @@
 // Copyright 2016-present 650 Industries. All rights reserved.
 
-#import <EXGL/EXGLContext.h>
-#import <EXGL/EXGLObjectManager.h>
+#import <ExpoGL/EXGLContext.h>
+#import <ExpoGL/EXGLObjectManager.h>
 
 #import <ExpoModulesCore/EXUtilities.h>
 #import <ExpoModulesCore/EXUIManager.h>

package/ios/{EXGL/EXGLObject.h → EXGLObject.h}

@@ -1,7 +1,7 @@
 // Copyright 2016-present 650 Industries. All rights reserved.
 
 #import <Foundation/Foundation.h>
-#import <EXGL/EXGLNativeApi.h>
+#import <ExpoGL/EXGLNativeApi.h>
 
 @interface EXGLObject : NSObject
 

package/ios/{EXGL/EXGLObject.mm → EXGLObject.mm}

@@ -1,6 +1,6 @@
 // Copyright 2016-present 650 Industries. All rights reserved.
 
-#import <EXGL/EXGLObject.h>
+#import <ExpoGL/EXGLObject.h>
 
 @implementation EXGLObject
 

package/ios/{EXGL/EXGLObjectManager.mm → EXGLObjectManager.mm}

@@ -4,10 +4,10 @@
 #import <ExpoModulesCore/EXUIManager.h>
 #import <ExpoModulesCore/EXCameraInterface.h>
 
-#import <EXGL/EXGLObjectManager.h>
-#import <EXGL/EXGLObject.h>
-#import <EXGL/EXGLView.h>
-#import <EXGL/EXGLCameraObject.h>
+#import <ExpoGL/EXGLObjectManager.h>
+#import <ExpoGL/EXGLObject.h>
+#import <ExpoGL/EXGLView.h>
+#import <ExpoGL/EXGLCameraObject.h>
 
 @interface EXGLObjectManager ()
 

package/ios/{EXGL/EXGLView.h → EXGLView.h}

@@ -1,14 +1,14 @@
 // Copyright 2016-present 650 Industries. All rights reserved.
 
-#import <EXGL/EXGLNativeApi.h>
-#import <EXGL/EXGLContext.h>
+#import <ExpoGL/EXGLNativeApi.h>
+#import <ExpoGL/EXGLContext.h>
 #import <ExpoModulesCore/EXModuleRegistry.h>
+#import <ExpoModulesCore/EXLegacyExpoViewProtocol.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface EXGLView : UIView <EXGLContextDelegate>
+@interface EXGLView : UIView <EXGLContextDelegate, EXLegacyExpoViewProtocol>
 
-- (instancetype)initWithModuleRegistry:(EXModuleRegistry *)moduleRegistry;
 - (EXGLContextId)exglCtxId;
 
 // AR
@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)maybeStopARSession;
 
 @property (nonatomic, copy, nullable) EXDirectEventBlock onSurfaceCreate;
-@property (nonatomic, assign) NSNumber *msaaSamples;
+@property (nonatomic, assign) NSInteger msaaSamples;
 
 // "protected"
 @property (nonatomic, strong, nullable) EXGLContext *glContext;

package/ios/{EXGL/EXGLView.mm → EXGLView.mm}

@@ -1,8 +1,8 @@
 // Copyright 2016-present 650 Industries. All rights reserved.
 
 #import <ExpoModulesCore/EXUtilities.h>
-#import <EXGL/EXGLView.h>
-#import <EXGL/EXGLContext.h>
+#import <ExpoGL/EXGLView.h>
+#import <ExpoGL/EXGLContext.h>
 
 #include <OpenGLES/ES2/glext.h>
 #include <OpenGLES/ES3/gl.h>
@@ -188,7 +188,7 @@
     glGenRenderbuffers(1, &self->_msaaRenderbuffer);
     glBindFramebuffer(GL_FRAMEBUFFER, self->_msaaFramebuffer);
     glBindRenderbuffer(GL_RENDERBUFFER, self->_msaaRenderbuffer);
-    glRenderbufferStorageMultisample(GL_RENDERBUFFER, self.msaaSamples.intValue, GL_RGBA8,
+    glRenderbufferStorageMultisample(GL_RENDERBUFFER, self.msaaSamples, GL_RGBA8,
                                      self->_layerWidth, self->_layerHeight);
     glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
                               GL_RENDERBUFFER, self->_msaaRenderbuffer);
@@ -198,7 +198,7 @@
     // Set up new depth+stencil renderbuffer
     glGenRenderbuffers(1, &self->_viewDepthStencilbuffer);
     glBindRenderbuffer(GL_RENDERBUFFER, self->_viewDepthStencilbuffer);
-    glRenderbufferStorageMultisample(GL_RENDERBUFFER, self.msaaSamples.intValue, GL_DEPTH24_STENCIL8,
+    glRenderbufferStorageMultisample(GL_RENDERBUFFER, self.msaaSamples, GL_DEPTH24_STENCIL8,
                                      self->_layerWidth, self->_layerHeight);
     glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
                               GL_RENDERBUFFER, self->_viewDepthStencilbuffer);

package/ios/{EXGL/EXPlatformUtils.mm → EXPlatformUtils.mm}

@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 
-#include <EXGL/EXPlatformUtils.h>
+#include <ExpoGL/EXPlatformUtils.h>
 
 namespace expo {
 namespace gl_cpp {

package/ios/GLViewModule.swift

@@ -0,0 +1,17 @@
+// Copyright 2022-present 650 Industries. All rights reserved.
+
+import ExpoModulesCore
+
+public final class GLViewModule: Module {
+  public func definition() -> ModuleDefinition {
+    Name("ExponentGLView")
+
+    View(EXGLView.self) {
+      Events("onSurfaceCreate")
+
+      Prop("msaaSamples") { (view, msaaSamples: Int) in
+        view.msaaSamples = msaaSamples
+      }
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gl",
-  "version": "12.0.0",
+  "version": "12.1.0",
   "description": "Provides GLView that acts as OpenGL ES render target and gives GL context object implementing WebGL 2.0 specification.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -49,5 +49,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "eab2b09c735fb0fc2bf734a3f29a6593adba3838"
+  "gitHead": "6e6bb61bb071a269e62c87aca1d579bec6361aa8"
 }

package/ios/EXGL/EXGLViewManager.h

@@ -1,8 +0,0 @@
-// Copyright 2016-present 650 Industries. All rights reserved.
-
-#import <ExpoModulesCore/EXViewManager.h>
-#import <ExpoModulesCore/EXModuleRegistryConsumer.h>
-
-@interface EXGLViewManager : EXViewManager <EXModuleRegistryConsumer>
-
-@end

package/ios/EXGL/EXGLViewManager.mm

@@ -1,42 +0,0 @@
-// Copyright 2016-present 650 Industries. All rights reserved.
-
-#import <EXGL/EXGLView.h>
-#import <EXGL/EXGLViewManager.h>
-#import <ExpoModulesCore/EXUIManager.h>
-
-@interface EXGLViewManager ()
-
-@property (nonatomic, weak) EXModuleRegistry *moduleRegistry;
-
-@end
-
-@implementation EXGLViewManager
-
-EX_EXPORT_MODULE(ExponentGLViewManager);
-
-- (UIView *)view
-{
-  return [[EXGLView alloc] initWithModuleRegistry:_moduleRegistry];
-}
-
-- (NSString *)viewName
-{
-  return @"ExponentGLView";
-}
-
-- (NSArray<NSString *> *)supportedEvents
-{
-  return @[@"onSurfaceCreate"];
-}
-
-EX_VIEW_PROPERTY(msaaSamples, NSNumber *, EXGLView)
-{
-  [view setMsaaSamples:value];
-}
-
-- (void)setModuleRegistry:(EXModuleRegistry *)moduleRegistry
-{
-  _moduleRegistry = moduleRegistry;
-}
-
-@end

package/ios/EXGL.xcframework/Info.plist

@@ -1,40 +0,0 @@
-<?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>LibraryIdentifier</key>
-			<string>ios-arm64</string>
-			<key>LibraryPath</key>
-			<string>EXGL.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-		</dict>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
-			<key>LibraryPath</key>
-			<string>EXGL.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</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>