From 62028d111421555f293831d478febcc54323537c Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Sun, 30 Jan 2022 13:59:42 +0800 Subject: [PATCH] package change and add libs --- android/build.gradle | 2 +- android/settings.gradle | 2 +- android/src/main/AndroidManifest.xml | 2 +- .../polyvox_filament/PolyvoxFilamentPlugin.kt | 35 ++++++ example/README.md | 4 +- example/android/app/build.gradle | 2 +- .../android/app/src/debug/AndroidManifest.xml | 2 +- .../android/app/src/main/AndroidManifest.xml | 4 +- .../mimetic_filament_example/MainActivity.kt | 6 - .../MainActivity.kt | 2 +- .../app/src/profile/AndroidManifest.xml | 2 +- example/ios/Runner.xcodeproj/project.pbxproj | 113 ++++++++++++++++-- .../xcshareddata/xcschemes/Runner.xcscheme | 10 +- example/ios/Runner/Info.plist | 2 +- example/pubspec.yaml | 13 +- 15 files changed, 160 insertions(+), 41 deletions(-) create mode 100644 android/src/main/kotlin/com/example/polyvox_filament/PolyvoxFilamentPlugin.kt delete mode 100644 example/android/app/src/main/kotlin/com/example/mimetic_filament_example/MainActivity.kt rename example/android/app/src/main/kotlin/com/example/{mimetic_avatar_example => polyvox_filament_example}/MainActivity.kt (68%) diff --git a/android/build.gradle b/android/build.gradle index b98ac941..67af2f30 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,4 +1,4 @@ -group 'com.example.holovox_filament' +group 'com.example.polyvox_filament' version '1.0-SNAPSHOT' buildscript { diff --git a/android/settings.gradle b/android/settings.gradle index 1fdc8a90..59eb7595 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1 +1 @@ -rootProject.name = 'holovox_filament' +rootProject.name = 'polyvox_filament' diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 6e03cd96..17e230b7 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,3 +1,3 @@ + package="com.example.polyvox_filament"> diff --git a/android/src/main/kotlin/com/example/polyvox_filament/PolyvoxFilamentPlugin.kt b/android/src/main/kotlin/com/example/polyvox_filament/PolyvoxFilamentPlugin.kt new file mode 100644 index 00000000..3a5f1c77 --- /dev/null +++ b/android/src/main/kotlin/com/example/polyvox_filament/PolyvoxFilamentPlugin.kt @@ -0,0 +1,35 @@ +package com.example.polyvox_filament + +import androidx.annotation.NonNull + +import io.flutter.embedding.engine.plugins.FlutterPlugin +import io.flutter.plugin.common.MethodCall +import io.flutter.plugin.common.MethodChannel +import io.flutter.plugin.common.MethodChannel.MethodCallHandler +import io.flutter.plugin.common.MethodChannel.Result + +/** PolyvoxFilamentPlugin */ +class PolyvoxFilamentPlugin: FlutterPlugin, MethodCallHandler { + /// The MethodChannel that will the communication between Flutter and native Android + /// + /// This local reference serves to register the plugin with the Flutter Engine and unregister it + /// when the Flutter Engine is detached from the Activity + private lateinit var channel : MethodChannel + + override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) { + channel = MethodChannel(flutterPluginBinding.binaryMessenger, "polyvox_filament") + channel.setMethodCallHandler(this) + } + + override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) { + if (call.method == "getPlatformVersion") { + result.success("Android ${android.os.Build.VERSION.RELEASE}") + } else { + result.notImplemented() + } + } + + override fun onDetachedFromEngine(@NonNull binding: FlutterPlugin.FlutterPluginBinding) { + channel.setMethodCallHandler(null) + } +} diff --git a/example/README.md b/example/README.md index ec21688a..3939d133 100644 --- a/example/README.md +++ b/example/README.md @@ -1,6 +1,6 @@ -# holovox_filament_example +# polyvox_filament_example -Demonstrates how to use the holovox_filament plugin. +Demonstrates how to use the polyvox_filament plugin. ## Getting Started diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 61fae8fa..e18fde3e 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -43,7 +43,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.holovox_filament_example" + applicationId "com.example.polyvox_filament_example" minSdkVersion 16 targetSdkVersion 30 versionCode flutterVersionCode.toInteger() diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml index d82f7efc..f0179638 100644 --- a/example/android/app/src/debug/AndroidManifest.xml +++ b/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.example.polyvox_filament_example"> diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index 2decfbf3..63911bc9 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="com.example.polyvox_filament_example"> + package="com.example.polyvox_filament_example"> diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index cd9d5b99..9d7db080 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -10,6 +10,26 @@ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 840FCC1E274298BB008E5682 /* libutils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840FCC12274298BA008E5682 /* libutils.a */; }; + 840FCC2A27429A42008E5682 /* libcamutils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840FCC13274298BA008E5682 /* libcamutils.a */; }; + 840FCC2B27429A42008E5682 /* libfilabridge.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840FCC16274298BB008E5682 /* libfilabridge.a */; }; + 840FCC2C27429A42008E5682 /* libfilaflat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840FCC17274298BB008E5682 /* libfilaflat.a */; }; + 840FCC2E27429A42008E5682 /* libfilameshio.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840FCC19274298BB008E5682 /* libfilameshio.a */; }; + 840FCC2F27429A42008E5682 /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840FCC1A274298BB008E5682 /* libgeometry.a */; }; + 840FCC3027429A42008E5682 /* libgltfio_core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840FCC18274298BB008E5682 /* libgltfio_core.a */; }; + 840FCC3127429A42008E5682 /* libgltfio_resources_lite.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840FCC1B274298BB008E5682 /* libgltfio_resources_lite.a */; }; + 840FCC3227429A42008E5682 /* libgltfio_resources.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840FCC1D274298BB008E5682 /* libgltfio_resources.a */; }; + 840FCC3327429A42008E5682 /* libmath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840FCC1C274298BB008E5682 /* libmath.a */; }; + 840FCC3427429A42008E5682 /* libmathio.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840FCC14274298BA008E5682 /* libmathio.a */; }; + 840FCC3927429B1F008E5682 /* libviewer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840FCC3527429B1F008E5682 /* libviewer.a */; }; + 840FCC3A27429B1F008E5682 /* libfilament-iblprefilter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840FCC3627429B1F008E5682 /* libfilament-iblprefilter.a */; }; + 840FCC3B27429B1F008E5682 /* libibl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840FCC3727429B1F008E5682 /* libibl.a */; }; + 840FCC3C27429B1F008E5682 /* libimage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840FCC3827429B1F008E5682 /* libimage.a */; }; + 840FCC3F27429BEC008E5682 /* libbackend.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840FCC3D27429BEC008E5682 /* libbackend.a */; }; + 840FCC4027429BEC008E5682 /* libfilament.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840FCC3E27429BEC008E5682 /* libfilament.a */; }; + 840FCC4227429C5B008E5682 /* libdracodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840FCC4127429C5B008E5682 /* libdracodec.a */; }; + 8444BD14275320B200A5921D /* libOGLCompiler.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8444BD12275320B100A5921D /* libOGLCompiler.a */; }; + 8444BD15275320B200A5921D /* libOSDependent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8444BD13275320B200A5921D /* libOSDependent.a */; }; 8A41CA36A92CBF01E35DB723 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 729293464FDAFA80294C03ED /* Pods_Runner.framework */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; @@ -38,6 +58,27 @@ 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 797D1F14B06B2A55521439EC /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 840FCC12274298BA008E5682 /* libutils.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libutils.a; path = ../../ios/lib/libutils.a; sourceTree = ""; }; + 840FCC13274298BA008E5682 /* libcamutils.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcamutils.a; path = ../../ios/lib/libcamutils.a; sourceTree = ""; }; + 840FCC14274298BA008E5682 /* libmathio.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmathio.a; path = ../../ios/lib/libmathio.a; sourceTree = ""; }; + 840FCC15274298BA008E5682 /* libfilamat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfilamat.a; path = ../../ios/lib/libfilamat.a; sourceTree = ""; }; + 840FCC16274298BB008E5682 /* libfilabridge.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfilabridge.a; path = ../../ios/lib/libfilabridge.a; sourceTree = ""; }; + 840FCC17274298BB008E5682 /* libfilaflat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfilaflat.a; path = ../../ios/lib/libfilaflat.a; sourceTree = ""; }; + 840FCC18274298BB008E5682 /* libgltfio_core.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgltfio_core.a; path = ../../ios/lib/libgltfio_core.a; sourceTree = ""; }; + 840FCC19274298BB008E5682 /* libfilameshio.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfilameshio.a; path = ../../ios/lib/libfilameshio.a; sourceTree = ""; }; + 840FCC1A274298BB008E5682 /* libgeometry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgeometry.a; path = ../../ios/lib/libgeometry.a; sourceTree = ""; }; + 840FCC1B274298BB008E5682 /* libgltfio_resources_lite.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgltfio_resources_lite.a; path = ../../ios/lib/libgltfio_resources_lite.a; sourceTree = ""; }; + 840FCC1C274298BB008E5682 /* libmath.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmath.a; path = ../../ios/lib/libmath.a; sourceTree = ""; }; + 840FCC1D274298BB008E5682 /* libgltfio_resources.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgltfio_resources.a; path = ../../ios/lib/libgltfio_resources.a; sourceTree = ""; }; + 840FCC3527429B1F008E5682 /* libviewer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libviewer.a; path = ../../ios/lib/libviewer.a; sourceTree = ""; }; + 840FCC3627429B1F008E5682 /* libfilament-iblprefilter.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libfilament-iblprefilter.a"; path = "../../ios/lib/libfilament-iblprefilter.a"; sourceTree = ""; }; + 840FCC3727429B1F008E5682 /* libibl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libibl.a; path = ../../ios/lib/libibl.a; sourceTree = ""; }; + 840FCC3827429B1F008E5682 /* libimage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libimage.a; path = ../../ios/lib/libimage.a; sourceTree = ""; }; + 840FCC3D27429BEC008E5682 /* libbackend.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbackend.a; path = ../../ios/lib/libbackend.a; sourceTree = ""; }; + 840FCC3E27429BEC008E5682 /* libfilament.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfilament.a; path = ../../ios/lib/libfilament.a; sourceTree = ""; }; + 840FCC4127429C5B008E5682 /* libdracodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdracodec.a; path = ../../ios/lib/libdracodec.a; sourceTree = ""; }; + 8444BD12275320B100A5921D /* libOGLCompiler.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libOGLCompiler.a; path = ../../ios/lib/libOGLCompiler.a; sourceTree = ""; }; + 8444BD13275320B200A5921D /* libOSDependent.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libOSDependent.a; path = ../../ios/lib/libOSDependent.a; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -54,6 +95,26 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8444BD14275320B200A5921D /* libOGLCompiler.a in Frameworks */, + 8444BD15275320B200A5921D /* libOSDependent.a in Frameworks */, + 840FCC4227429C5B008E5682 /* libdracodec.a in Frameworks */, + 840FCC3F27429BEC008E5682 /* libbackend.a in Frameworks */, + 840FCC4027429BEC008E5682 /* libfilament.a in Frameworks */, + 840FCC3927429B1F008E5682 /* libviewer.a in Frameworks */, + 840FCC3A27429B1F008E5682 /* libfilament-iblprefilter.a in Frameworks */, + 840FCC3B27429B1F008E5682 /* libibl.a in Frameworks */, + 840FCC3C27429B1F008E5682 /* libimage.a in Frameworks */, + 840FCC2A27429A42008E5682 /* libcamutils.a in Frameworks */, + 840FCC2B27429A42008E5682 /* libfilabridge.a in Frameworks */, + 840FCC2C27429A42008E5682 /* libfilaflat.a in Frameworks */, + 840FCC2E27429A42008E5682 /* libfilameshio.a in Frameworks */, + 840FCC2F27429A42008E5682 /* libgeometry.a in Frameworks */, + 840FCC3027429A42008E5682 /* libgltfio_core.a in Frameworks */, + 840FCC3127429A42008E5682 /* libgltfio_resources_lite.a in Frameworks */, + 840FCC3227429A42008E5682 /* libgltfio_resources.a in Frameworks */, + 840FCC3327429A42008E5682 /* libmath.a in Frameworks */, + 840FCC3427429A42008E5682 /* libmathio.a in Frameworks */, + 840FCC1E274298BB008E5682 /* libutils.a in Frameworks */, 8A41CA36A92CBF01E35DB723 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -119,6 +180,27 @@ F66758AA6E5A6218A5D00433 /* Frameworks */ = { isa = PBXGroup; children = ( + 8444BD12275320B100A5921D /* libOGLCompiler.a */, + 8444BD13275320B200A5921D /* libOSDependent.a */, + 840FCC4127429C5B008E5682 /* libdracodec.a */, + 840FCC3D27429BEC008E5682 /* libbackend.a */, + 840FCC3E27429BEC008E5682 /* libfilament.a */, + 840FCC3627429B1F008E5682 /* libfilament-iblprefilter.a */, + 840FCC3727429B1F008E5682 /* libibl.a */, + 840FCC3827429B1F008E5682 /* libimage.a */, + 840FCC3527429B1F008E5682 /* libviewer.a */, + 840FCC13274298BA008E5682 /* libcamutils.a */, + 840FCC16274298BB008E5682 /* libfilabridge.a */, + 840FCC17274298BB008E5682 /* libfilaflat.a */, + 840FCC15274298BA008E5682 /* libfilamat.a */, + 840FCC19274298BB008E5682 /* libfilameshio.a */, + 840FCC1A274298BB008E5682 /* libgeometry.a */, + 840FCC18274298BB008E5682 /* libgltfio_core.a */, + 840FCC1B274298BB008E5682 /* libgltfio_resources_lite.a */, + 840FCC1D274298BB008E5682 /* libgltfio_resources.a */, + 840FCC1C274298BB008E5682 /* libmath.a */, + 840FCC14274298BA008E5682 /* libmathio.a */, + 840FCC12274298BA008E5682 /* libutils.a */, 729293464FDAFA80294C03ED /* Pods_Runner.framework */, ); name = Frameworks; @@ -154,7 +236,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1310; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -303,6 +385,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -323,7 +406,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; STRIP_INSTALLED_PRODUCT = NO; @@ -349,8 +432,12 @@ "$(inherited)", "@executable_path/Frameworks", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "${PODS_ROOT}/../.symlinks/plugins/polyvox_filament/ios/lib", + ); PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.example.holovoxAvatarExample; + PRODUCT_BUNDLE_IDENTIFIER = "app.polyvox.filament-example"; PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -382,6 +469,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -408,7 +496,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LIBRARY_SEARCH_PATHS = "$(inherited)"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -440,6 +529,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -460,7 +550,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LIBRARY_SEARCH_PATHS = "$(inherited)"; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; STRIP_INSTALLED_PRODUCT = NO; @@ -488,8 +579,12 @@ "$(inherited)", "@executable_path/Frameworks", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "${PODS_ROOT}/../.symlinks/plugins/polyvox_filament/ios/lib", + ); PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.example.holovoxAvatarExample; + PRODUCT_BUNDLE_IDENTIFIER = "app.polyvox.filament-example"; PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -515,8 +610,12 @@ "$(inherited)", "@executable_path/Frameworks", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "${PODS_ROOT}/../.symlinks/plugins/polyvox_filament/ios/lib", + ); PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.example.holovoxAvatarExample; + PRODUCT_BUNDLE_IDENTIFIER = "app.polyvox.filament-example"; PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a28140cf..bfbb2561 100644 --- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ - - - - + + - - CFBundleInfoDictionaryVersion 6.0 CFBundleName - holovox_filament_example + polyvox_filament_example CFBundlePackageType APPL CFBundleShortVersionString diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 8c52c112..bee540ab 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,5 +1,5 @@ -name: holovox_filament_example -description: Demonstrates how to use the holovox_filament plugin. +name: polyvox_filament_example +description: Demonstrates how to use the polyvox_filament plugin. # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. @@ -18,7 +18,7 @@ dependencies: flutter: sdk: flutter - holovox_filament: + polyvox_filament: path: ../ cupertino_icons: ^1.0.2 @@ -26,14 +26,9 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - - # The "flutter_lints" package below contains a set of recommended lints to - # encourage good coding practices. The lint set provided by the package is - # activated in the `analysis_options.yaml` file located at the root of your - # package. See that file for information about deactivating specific lint - # rules and activating additional ones. flutter_lints: ^1.0.0 + # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec