From 21b01d1a15a3bb5a1d3ed725f245211b69f9eb9b Mon Sep 17 00:00:00 2001 From: Norman Breau Date: Thu, 21 Nov 2024 08:45:51 -0400 Subject: [PATCH] iOS test app, native-view, gmaps, and fs plugins --- android/README.md | 29 ++++ ios/.gitignore | 2 + .../contents.xcworkspacedata | 23 ++- ios/BTFuse/BTFuse.xcodeproj/project.pbxproj | 74 +++------ ios/Podfile | 14 -- ios/Podfile.lock | 16 -- ios/README.md | 2 +- ios/fetch_deps.sh | 50 ++++++ js/README.md | 25 +++ .../BTFuseFilesystem.debug.xcconfig | 1 - .../BTFuseFilesystem.release.xcconfig | 1 - .../project.pbxproj | 41 ++--- .../BTFuseGoogleMap.xcodeproj/project.pbxproj | 147 ++++++++---------- .../src/BTFuseGoogleMapPlugin.m | 2 +- .../project.pbxproj | 131 ++++++++-------- plugins/google-maps/ios/Podfile | 24 --- plugins/google-maps/ios/Podfile.lock | 29 ---- .../project.pbxproj | 24 ++- .../project.pbxproj | 8 +- .../ios/testapp.xcodeproj/project.pbxproj | 2 +- test-app/ios/testapp/assets/assets/index.html | 10 ++ 21 files changed, 317 insertions(+), 338 deletions(-) create mode 100644 android/README.md delete mode 100644 ios/Podfile delete mode 100644 ios/Podfile.lock create mode 100755 ios/fetch_deps.sh create mode 100644 js/README.md delete mode 100644 plugins/google-maps/ios/Podfile delete mode 100644 plugins/google-maps/ios/Podfile.lock create mode 100644 test-app/ios/testapp/assets/assets/index.html diff --git a/android/README.md b/android/README.md new file mode 100644 index 0000000..f75ade0 --- /dev/null +++ b/android/README.md @@ -0,0 +1,29 @@ + +# Fuse Android + +This is the Android Fuse module, providing the platform implementation for the Fuse framework on Android devices and simulators. + +## Checking out the code + +This module uses git submodules, clone via: + +``` +git clone https://github.com/btfuse/fuse.git --recurse-submodules +``` + +## Building + +To build the AAR, run `./build.sh`. Otherwise, open the `android` in Android Studio and build the `fuse` module. + +## Testing + +Run `./test.sh` which will launch tests for all supported Android versions. + +Alternatively, `test.sh` script also accepts the following arguments + +|Command|Description| +|---|---| +|`./test.sh `|Test against a specific API level using Gradle Managed Devices. Only API 28+ are supported.| +|`./test.sh local`|Runs local unit tests only. No android simulator or device needed, but most tests required an android environment.| +|`./test.sh device`|Use a connected device or simulator to run the tests| + diff --git a/ios/.gitignore b/ios/.gitignore index b800f44..808e899 100644 --- a/ios/.gitignore +++ b/ios/.gitignore @@ -4,3 +4,5 @@ /BTFuse.podspec /BTFuseTestTools.podspec /Pods +/third_party +!/third_party/README diff --git a/ios/BTFuse.xcworkspace/contents.xcworkspacedata b/ios/BTFuse.xcworkspace/contents.xcworkspacedata index 0b15200..db33a27 100644 --- a/ios/BTFuse.xcworkspace/contents.xcworkspacedata +++ b/ios/BTFuse.xcworkspace/contents.xcworkspacedata @@ -13,9 +13,6 @@ - - @@ -23,6 +20,16 @@ + + + + + + @@ -41,4 +48,14 @@ + + + + + + diff --git a/ios/BTFuse/BTFuse.xcodeproj/project.pbxproj b/ios/BTFuse/BTFuse.xcodeproj/project.pbxproj index 44c555d..407999e 100644 --- a/ios/BTFuse/BTFuse.xcodeproj/project.pbxproj +++ b/ios/BTFuse/BTFuse.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 4623189FF7D4E90BE001140D /* Pods_BTFuse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F8F21041C403672D61CB71B /* Pods_BTFuse.framework */; }; 940127172AD78F6200F76331 /* BTFuseJSONSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 940127162AD78F6200F76331 /* BTFuseJSONSerializer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 940127192AD78FFD00F76331 /* BTFuseJSONSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 940127182AD78FFD00F76331 /* BTFuseJSONSerializer.m */; }; 9418629B2A99564600CCFEE1 /* BTFuseAPIRouter.h in Headers */ = {isa = PBXBuildFile; fileRef = 9418629A2A99564600CCFEE1 /* BTFuseAPIRouter.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -31,7 +30,6 @@ 94552C632ACC367600DAE0F4 /* BTFuseLoggerLevel.m in Sources */ = {isa = PBXBuildFile; fileRef = 94552C622ACC367600DAE0F4 /* BTFuseLoggerLevel.m */; }; 94552C652ACCD47C00DAE0F4 /* BTFuseLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 94552C642ACCD47C00DAE0F4 /* BTFuseLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; 94552C672ACCD67100DAE0F4 /* BTFuseLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 94552C662ACCD67100DAE0F4 /* BTFuseLogger.m */; }; - 945A05982AE5838D0042C88A /* BTFuseTestTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 945A05972AE5838D0042C88A /* BTFuseTestTools.framework */; }; 94668BEC2B202EDA00976FC1 /* BTFuseWebviewNavigationDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 94668BEB2B202EDA00976FC1 /* BTFuseWebviewNavigationDelegate.h */; }; 94668BEE2B202F3200976FC1 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94668BED2B202F3200976FC1 /* WebKit.framework */; }; 94668BF02B202F4900976FC1 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94668BEF2B202F4900976FC1 /* UIKit.framework */; }; @@ -53,7 +51,6 @@ 9489EBBA2AA65A990087424D /* BTFuseLocalization.m in Sources */ = {isa = PBXBuildFile; fileRef = 9489EBB92AA65A990087424D /* BTFuseLocalization.m */; }; 949DEED72C45FB1C00DEDD84 /* BTFuseStreamReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 949DEED62C45FB1C00DEDD84 /* BTFuseStreamReader.h */; settings = {ATTRIBUTES = (Public, ); }; }; 949DEED92C45FB6C00DEDD84 /* BTFuseStreamReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 949DEED82C45FB6C00DEDD84 /* BTFuseStreamReader.m */; }; - 949DEEF12C496FAC00DEDD84 /* OpenSSL.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 949DEEF02C496FAC00DEDD84 /* OpenSSL.xcframework */; }; 94A886B72A714F6D0098530D /* BTFuse.h in Headers */ = {isa = PBXBuildFile; fileRef = 94A8865C2A702C6C0098530D /* BTFuse.h */; settings = {ATTRIBUTES = (Public, ); }; }; 94A886B82A714F6D0098530D /* BTFuseContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 94A886632A702D240098530D /* BTFuseContext.h */; settings = {ATTRIBUTES = (Public, ); }; }; 94A886B92A714F6D0098530D /* BTFuseSchemeHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 94A886682A702F020098530D /* BTFuseSchemeHandler.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -73,6 +70,8 @@ 94A928572B1A729000AAC44A /* BTFuseIDGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 94A928562B1A729000AAC44A /* BTFuseIDGenerator.m */; }; 94B0A68F2AB776DC008C291A /* BTFuseAPIServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 94B0A68E2AB776DC008C291A /* BTFuseAPIServer.h */; }; 94B0A6932AB77790008C291A /* BTFuseAPIServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 94B0A6922AB77790008C291A /* BTFuseAPIServer.m */; }; + 94B3ABEB2CCECBDF00BD34E2 /* OpenSSL.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3ABEA2CCECBDF00BD34E2 /* OpenSSL.xcframework */; }; + 94B3ABEC2CCECBDF00BD34E2 /* OpenSSL.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3ABEA2CCECBDF00BD34E2 /* OpenSSL.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 94B7A9CF2AC89E39003D294D /* BTFuseTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 94B7A9CE2AC89E39003D294D /* BTFuseTests.m */; }; 94B7A9D02AC89E39003D294D /* BTFuse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94A886C22A714F6D0098530D /* BTFuse.framework */; platformFilter = ios; }; 94C3AF282B6867B8006AD040 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 94C3AF272B6867B8006AD040 /* LICENSE */; }; @@ -89,8 +88,21 @@ }; /* End PBXContainerItemProxy section */ +/* Begin PBXCopyFilesBuildPhase section */ + 94B3ABED2CCECBE000BD34E2 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 94B3ABEC2CCECBDF00BD34E2 /* OpenSSL.xcframework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ - 3F8F21041C403672D61CB71B /* Pods_BTFuse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_BTFuse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 940127162AD78F6200F76331 /* BTFuseJSONSerializer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BTFuseJSONSerializer.h; sourceTree = ""; }; 940127182AD78FFD00F76331 /* BTFuseJSONSerializer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BTFuseJSONSerializer.m; sourceTree = ""; }; 9418629A2A99564600CCFEE1 /* BTFuseAPIRouter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BTFuseAPIRouter.h; sourceTree = ""; }; @@ -115,8 +127,6 @@ 94552C622ACC367600DAE0F4 /* BTFuseLoggerLevel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BTFuseLoggerLevel.m; sourceTree = ""; }; 94552C642ACCD47C00DAE0F4 /* BTFuseLogger.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BTFuseLogger.h; sourceTree = ""; }; 94552C662ACCD67100DAE0F4 /* BTFuseLogger.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BTFuseLogger.m; sourceTree = ""; }; - 945A05972AE5838D0042C88A /* BTFuseTestTools.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BTFuseTestTools.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 94668BD22B1EBBB300976FC1 /* libopenssl.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libopenssl.a; sourceTree = BUILT_PRODUCTS_DIR; }; 94668BEB2B202EDA00976FC1 /* BTFuseWebviewNavigationDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BTFuseWebviewNavigationDelegate.h; sourceTree = ""; }; 94668BED2B202F3200976FC1 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; 94668BEF2B202F4900976FC1 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -138,7 +148,6 @@ 9489EBB92AA65A990087424D /* BTFuseLocalization.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BTFuseLocalization.m; sourceTree = ""; }; 949DEED62C45FB1C00DEDD84 /* BTFuseStreamReader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BTFuseStreamReader.h; sourceTree = ""; }; 949DEED82C45FB6C00DEDD84 /* BTFuseStreamReader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BTFuseStreamReader.m; sourceTree = ""; }; - 949DEEF02C496FAC00DEDD84 /* OpenSSL.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = OpenSSL.xcframework; path = ../Pods/OpenSSL/OpenSSL.xcframework; sourceTree = ""; }; 949DEEF52C4970FF00DEDD84 /* BTFuse.debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = BTFuse.debug.xcconfig; path = configs/BTFuse.debug.xcconfig; sourceTree = ""; }; 94A8865C2A702C6C0098530D /* BTFuse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BTFuse.h; sourceTree = ""; }; 94A886632A702D240098530D /* BTFuseContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BTFuseContext.h; sourceTree = ""; }; @@ -160,12 +169,11 @@ 94A928562B1A729000AAC44A /* BTFuseIDGenerator.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BTFuseIDGenerator.m; sourceTree = ""; }; 94B0A68E2AB776DC008C291A /* BTFuseAPIServer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BTFuseAPIServer.h; sourceTree = ""; }; 94B0A6922AB77790008C291A /* BTFuseAPIServer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BTFuseAPIServer.m; sourceTree = ""; }; + 94B3ABEA2CCECBDF00BD34E2 /* OpenSSL.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = OpenSSL.xcframework; path = /Users/norman/development/breautek/fuse/ios/third_party/com.breautek.btfuse.third_party/../openssl/OpenSSL.xcframework; sourceTree = ""; }; 94B7A9CC2AC89E39003D294D /* BTFuseTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BTFuseTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 94B7A9CE2AC89E39003D294D /* BTFuseTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BTFuseTests.m; sourceTree = ""; }; 94C3AF272B6867B8006AD040 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = ""; }; 94DF9FB62B293C9C00757EA7 /* UniformTypeIdentifiers.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UniformTypeIdentifiers.framework; path = System/Library/Frameworks/UniformTypeIdentifiers.framework; sourceTree = SDKROOT; }; - C0D504787CFDCC13C7D8462D /* Pods-BTFuse.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BTFuse.release.xcconfig"; path = "Target Support Files/Pods-BTFuse/Pods-BTFuse.release.xcconfig"; sourceTree = ""; }; - D2524D348AB6B72B049BC41D /* Pods-BTFuse.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BTFuse.debug.xcconfig"; path = "Target Support Files/Pods-BTFuse/Pods-BTFuse.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -173,13 +181,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 94B3ABEB2CCECBDF00BD34E2 /* OpenSSL.xcframework in Frameworks */, 94DF9FB72B293C9C00757EA7 /* UniformTypeIdentifiers.framework in Frameworks */, 94668BF02B202F4900976FC1 /* UIKit.framework in Frameworks */, - 949DEEF12C496FAC00DEDD84 /* OpenSSL.xcframework in Frameworks */, 94668BEE2B202F3200976FC1 /* WebKit.framework in Frameworks */, 9443F0BB2B1BCEE10056B054 /* Security.framework in Frameworks */, 9435AEE02B0995AC00C1140A /* Network.framework in Frameworks */, - 4623189FF7D4E90BE001140D /* Pods_BTFuse.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -188,7 +195,6 @@ buildActionMask = 2147483647; files = ( 94B7A9D02AC89E39003D294D /* BTFuse.framework in Frameworks */, - 945A05982AE5838D0042C88A /* BTFuseTestTools.framework in Frameworks */, 94668C002B22CC1800976FC1 /* libecho.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -196,16 +202,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 1F90CC1D6A769DDF9C55C4B5 /* Pods */ = { - isa = PBXGroup; - children = ( - D2524D348AB6B72B049BC41D /* Pods-BTFuse.debug.xcconfig */, - C0D504787CFDCC13C7D8462D /* Pods-BTFuse.release.xcconfig */, - ); - name = Pods; - path = ../Pods; - sourceTree = ""; - }; 94552C592ACB349A00DAE0F4 /* configurations */ = { isa = PBXGroup; children = ( @@ -252,7 +248,6 @@ 94B7A9CD2AC89E39003D294D /* BTFuseTests */, 94A8865A2A702C6C0098530D /* Products */, B09295BDA9DD81FE38C25D6F /* Frameworks */, - 1F90CC1D6A769DDF9C55C4B5 /* Pods */, ); sourceTree = ""; }; @@ -369,16 +364,13 @@ B09295BDA9DD81FE38C25D6F /* Frameworks */ = { isa = PBXGroup; children = ( - 949DEEF02C496FAC00DEDD84 /* OpenSSL.xcframework */, + 94B3ABEA2CCECBDF00BD34E2 /* OpenSSL.xcframework */, 94DF9FB62B293C9C00757EA7 /* UniformTypeIdentifiers.framework */, 94668BFF2B22CC1800976FC1 /* libecho.a */, 94668BEF2B202F4900976FC1 /* UIKit.framework */, 94668BED2B202F3200976FC1 /* WebKit.framework */, - 94668BD22B1EBBB300976FC1 /* libopenssl.a */, 9443F0BA2B1BCEE10056B054 /* Security.framework */, 9435AEDF2B0995AC00C1140A /* Network.framework */, - 945A05972AE5838D0042C88A /* BTFuseTestTools.framework */, - 3F8F21041C403672D61CB71B /* Pods_BTFuse.framework */, ); name = Frameworks; sourceTree = ""; @@ -428,11 +420,11 @@ isa = PBXNativeTarget; buildConfigurationList = 94A886BF2A714F6D0098530D /* Build configuration list for PBXNativeTarget "BTFuse" */; buildPhases = ( - 86DD15681D11060B0F30F338 /* [CP] Check Pods Manifest.lock */, 94A886B62A714F6D0098530D /* Headers */, 94A886BA2A714F6D0098530D /* Sources */, 94A886BD2A714F6D0098530D /* Frameworks */, 94A886BE2A714F6D0098530D /* Resources */, + 94B3ABED2CCECBE000BD34E2 /* Embed Frameworks */, ); buildRules = ( ); @@ -517,31 +509,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 86DD15681D11060B0F30F338 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-BTFuse-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 94A886BA2A714F6D0098530D /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -737,7 +704,6 @@ }; 94A886C02A714F6D0098530D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D2524D348AB6B72B049BC41D /* Pods-BTFuse.debug.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; diff --git a/ios/Podfile b/ios/Podfile deleted file mode 100644 index 17e386c..0000000 --- a/ios/Podfile +++ /dev/null @@ -1,14 +0,0 @@ - -platform :ios, '15.0' - -workspace 'BTFuse.xcworkspace' - -source 'https://github.com/breautek/pods.git' - -target 'BTFuse' do - use_frameworks! - project 'BTFuse/BTFuse.xcodeproj' - - pod 'OpenSSL', '3.2.0-fuse-2' -end - diff --git a/ios/Podfile.lock b/ios/Podfile.lock deleted file mode 100644 index 3e8b24e..0000000 --- a/ios/Podfile.lock +++ /dev/null @@ -1,16 +0,0 @@ -PODS: - - OpenSSL (3.2.0-fuse-2) - -DEPENDENCIES: - - OpenSSL (= 3.2.0-fuse-2) - -SPEC REPOS: - https://github.com/breautek/pods.git: - - OpenSSL - -SPEC CHECKSUMS: - OpenSSL: bcb2addba483c1d1bf4c80c69060c345111dd99d - -PODFILE CHECKSUM: 56aef115f2e167bf6d8dc0430bc4f4fecf9333d7 - -COCOAPODS: 1.15.2 diff --git a/ios/README.md b/ios/README.md index 929df63..64bed95 100644 --- a/ios/README.md +++ b/ios/README.md @@ -8,7 +8,7 @@ This is the iOS Fuse module, providing the platform implementation for the Fuse This module uses git submodules, clone via: ``` -git clone https://github.com/btfuse/fuse-ios.git --recurse-submodules +git clone https://github.com/btfuse/fuse.git --recurse-submodules ``` ## Building diff --git a/ios/fetch_deps.sh b/ios/fetch_deps.sh new file mode 100755 index 0000000..e8623be --- /dev/null +++ b/ios/fetch_deps.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +# Copyright 2024 Breautek + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +source ../build-tools/DirectoryTools.sh + +mkdir -p third_party + +OPENSSL_VERSION="3.2.0-fuse-2" +GOOGLE_MAPS_VERSION="9.1.1" + +cd third_party + +rm -rf google-maps +mkdir -p google-maps +spushd google-maps + wget https://dl.google.com/geosdk/swiftpm/$GOOGLE_MAPS_VERSION/GoogleMaps_3p.xcframework.zip + wget https://dl.google.com/geosdk/swiftpm/$GOOGLE_MAPS_VERSION/GoogleMapsBase_3p.xcframework.zip + wget https://dl.google.com/geosdk/swiftpm/$GOOGLE_MAPS_VERSION/GoogleMapsCore_3p.xcframework.zip + wget https://dl.google.com/geosdk/swiftpm/$GOOGLE_MAPS_VERSION/GoogleMapsResources.zip + + unzip GoogleMaps_3p.xcframework.zip + unzip GoogleMapsBase_3p.xcframework.zip + unzip GoogleMapsCore_3p.xcframework.zip + unzip GoogleMapsResource.zip + + rm -f *.zip +spopd + +rm -rf openssl +mkdir -p openssl +spushd openssl + wget https://github.com/btfuse/openssl/releases/download/$OPENSSL_VERSION/OpenSSL.xcframework.zip + + unzip OpenSSL.xcframework.zip + + rm -f *.zip +spopd diff --git a/js/README.md b/js/README.md new file mode 100644 index 0000000..be6a959 --- /dev/null +++ b/js/README.md @@ -0,0 +1,25 @@ + +# Fuse JS + +This is the JS Fuse module, providing the interface for communicating with the native Fuse framework from within the device's webview. + +## Checking out the code + +This module uses git submodules, clone via: + +``` +git clone https://github.com/btfuse/fuse.git --recurse-submodules +``` + +## Building + +To build, run: + +```bash +npm install +npm run build +``` + +## Testing + +Run `npm test` diff --git a/plugins/filesystem/ios/BTFuseFilesystem/BTFuseFilesystem.debug.xcconfig b/plugins/filesystem/ios/BTFuseFilesystem/BTFuseFilesystem.debug.xcconfig index a5d7ab2..eec0e85 100644 --- a/plugins/filesystem/ios/BTFuseFilesystem/BTFuseFilesystem.debug.xcconfig +++ b/plugins/filesystem/ios/BTFuseFilesystem/BTFuseFilesystem.debug.xcconfig @@ -13,6 +13,5 @@ // See the License for the specific language governing permissions and // limitations under the License. -//#include "../Pods/Target Support Files/Pods-BTFuseFilesystem/Pods-BTFuseFilesystem.debug.xcconfig" #include "VERSION.xcconfig" diff --git a/plugins/filesystem/ios/BTFuseFilesystem/BTFuseFilesystem.release.xcconfig b/plugins/filesystem/ios/BTFuseFilesystem/BTFuseFilesystem.release.xcconfig index a334ec0..eec0e85 100644 --- a/plugins/filesystem/ios/BTFuseFilesystem/BTFuseFilesystem.release.xcconfig +++ b/plugins/filesystem/ios/BTFuseFilesystem/BTFuseFilesystem.release.xcconfig @@ -13,6 +13,5 @@ // See the License for the specific language governing permissions and // limitations under the License. -//#include "../Pods/Target Support Files/Pods-BTFuseFilesystem/Pods-BTFuseFilesystem.release.xcconfig" #include "VERSION.xcconfig" diff --git a/plugins/filesystem/ios/BTFuseFilesystem/BTFuseFilesystem.xcodeproj/project.pbxproj b/plugins/filesystem/ios/BTFuseFilesystem/BTFuseFilesystem.xcodeproj/project.pbxproj index 26f55b4..8ea81a7 100644 --- a/plugins/filesystem/ios/BTFuseFilesystem/BTFuseFilesystem.xcodeproj/project.pbxproj +++ b/plugins/filesystem/ios/BTFuseFilesystem/BTFuseFilesystem.xcodeproj/project.pbxproj @@ -7,10 +7,9 @@ objects = { /* Begin PBXBuildFile section */ - 94B3ABCC2CCE819500BD34E2 /* BTFuse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3ABCB2CCE819500BD34E2 /* BTFuse.framework */; }; - 94B3ABCD2CCE819500BD34E2 /* BTFuse.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3ABCB2CCE819500BD34E2 /* BTFuse.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 94B3ABD02CCE81A900BD34E2 /* BTFuseTestTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3ABCF2CCE81A900BD34E2 /* BTFuseTestTools.framework */; }; - 94B3ABD12CCE81A900BD34E2 /* BTFuseTestTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3ABCF2CCE81A900BD34E2 /* BTFuseTestTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 94B3AC012CCECD4300BD34E2 /* BTFuse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC002CCECD4300BD34E2 /* BTFuse.framework */; }; + 94B3AC042CCECD5C00BD34E2 /* BTFuseTestTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC032CCECD5C00BD34E2 /* BTFuseTestTools.framework */; }; + 94B3AC052CCECD5C00BD34E2 /* BTFuseTestTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC032CCECD5C00BD34E2 /* BTFuseTestTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 94DF4C302B39DB2C00322BEC /* BTFuseFilesystemTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 94DF4C2F2B39DB2C00322BEC /* BTFuseFilesystemTests.m */; }; 94DF4C312B39DB2C00322BEC /* BTFuseFilesystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 94DF4C232B39DB2C00322BEC /* BTFuseFilesystem.h */; settings = {ATTRIBUTES = (Public, ); }; }; 94DF4C422B39E4B500322BEC /* BTFuseFilesystem.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94DF4C202B39DB2C00322BEC /* BTFuseFilesystem.framework */; }; @@ -37,17 +36,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ - 94B3ABCE2CCE819500BD34E2 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 94B3ABCD2CCE819500BD34E2 /* BTFuse.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; 94DF4C412B39E4B300322BEC /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -55,7 +43,7 @@ dstSubfolderSpec = 10; files = ( 94DF4C432B39E4B500322BEC /* BTFuseFilesystem.framework in Embed Frameworks */, - 94B3ABD12CCE81A900BD34E2 /* BTFuseTestTools.framework in Embed Frameworks */, + 94B3AC052CCECD5C00BD34E2 /* BTFuseTestTools.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -63,10 +51,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 2D0B7B3C190DCCE629619A70 /* Pods_BTFuseFilesystem.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_BTFuseFilesystem.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 632C4589F2507B00AB78F641 /* Pods_BTFuseFilesystemTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_BTFuseFilesystemTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 94B3ABCB2CCE819500BD34E2 /* BTFuse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BTFuse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 94B3ABCF2CCE81A900BD34E2 /* BTFuseTestTools.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BTFuseTestTools.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 94B3AC002CCECD4300BD34E2 /* BTFuse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BTFuse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 94B3AC032CCECD5C00BD34E2 /* BTFuseTestTools.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BTFuseTestTools.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 94DF4C202B39DB2C00322BEC /* BTFuseFilesystem.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BTFuseFilesystem.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 94DF4C232B39DB2C00322BEC /* BTFuseFilesystem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BTFuseFilesystem.h; sourceTree = ""; }; 94DF4C2A2B39DB2C00322BEC /* BTFuseFilesystemTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BTFuseFilesystemTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -82,8 +68,6 @@ 94DF4C582B41F0DA00322BEC /* BTFuseFilesystemUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BTFuseFilesystemUtils.m; sourceTree = ""; }; 94FA40782C07E452000AF380 /* BTFuseFilesystem.debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = BTFuseFilesystem.debug.xcconfig; sourceTree = ""; }; 94FA40792C07E475000AF380 /* BTFuseFilesystem.release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = BTFuseFilesystem.release.xcconfig; sourceTree = ""; }; - 94FA407A2C07E543000AF380 /* BTFuse.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = BTFuse.xcframework; path = ../Pods/BTFuse/BTFuse.xcframework; sourceTree = ""; }; - 94FA40802C07E663000AF380 /* BTFuseTestTools.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = BTFuseTestTools.xcframework; path = ../Pods/BTFuseTestTools/BTFuseTestTools.xcframework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -91,7 +75,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 94B3ABCC2CCE819500BD34E2 /* BTFuse.framework in Frameworks */, + 94B3AC012CCECD4300BD34E2 /* BTFuse.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -100,7 +84,7 @@ buildActionMask = 2147483647; files = ( 94DF4C422B39E4B500322BEC /* BTFuseFilesystem.framework in Frameworks */, - 94B3ABD02CCE81A900BD34E2 /* BTFuseTestTools.framework in Frameworks */, + 94B3AC042CCECD5C00BD34E2 /* BTFuseTestTools.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -149,12 +133,8 @@ 94DF4C3A2B39E47A00322BEC /* Frameworks */ = { isa = PBXGroup; children = ( - 94B3ABCF2CCE81A900BD34E2 /* BTFuseTestTools.framework */, - 94B3ABCB2CCE819500BD34E2 /* BTFuse.framework */, - 94FA40802C07E663000AF380 /* BTFuseTestTools.xcframework */, - 94FA407A2C07E543000AF380 /* BTFuse.xcframework */, - 2D0B7B3C190DCCE629619A70 /* Pods_BTFuseFilesystem.framework */, - 632C4589F2507B00AB78F641 /* Pods_BTFuseFilesystemTests.framework */, + 94B3AC032CCECD5C00BD34E2 /* BTFuseTestTools.framework */, + 94B3AC002CCECD4300BD34E2 /* BTFuse.framework */, ); name = Frameworks; sourceTree = ""; @@ -225,7 +205,6 @@ 94DF4C1C2B39DB2C00322BEC /* Sources */, 94DF4C1D2B39DB2C00322BEC /* Frameworks */, 94DF4C1E2B39DB2C00322BEC /* Resources */, - 94B3ABCE2CCE819500BD34E2 /* Embed Frameworks */, ); buildRules = ( ); diff --git a/plugins/google-maps/ios/BTFuseGoogleMap/BTFuseGoogleMap.xcodeproj/project.pbxproj b/plugins/google-maps/ios/BTFuseGoogleMap/BTFuseGoogleMap.xcodeproj/project.pbxproj index 0868219..e439a1b 100644 --- a/plugins/google-maps/ios/BTFuseGoogleMap/BTFuseGoogleMap.xcodeproj/project.pbxproj +++ b/plugins/google-maps/ios/BTFuseGoogleMap/BTFuseGoogleMap.xcodeproj/project.pbxproj @@ -10,15 +10,25 @@ 940943F72B9A488E008150D1 /* BTFuseGoogleMap.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 940943EE2B9A488E008150D1 /* BTFuseGoogleMap.framework */; }; 940943FC2B9A488E008150D1 /* BTFuseGoogleMapTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 940943FB2B9A488E008150D1 /* BTFuseGoogleMapTests.m */; }; 940943FD2B9A488E008150D1 /* BTFuseGoogleMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 940943F12B9A488E008150D1 /* BTFuseGoogleMap.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9436BD6A2BF6CE7C00E1A268 /* BTFuseNativeView.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9436BD692BF6CE7C00E1A268 /* BTFuseNativeView.xcframework */; }; - 9436BD772BF6D33800E1A268 /* GoogleMaps.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 9436BD762BF6D33800E1A268 /* GoogleMaps.bundle */; }; + 94B3ABEF2CCECC5C00BD34E2 /* BTFuse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3ABEE2CCECC5C00BD34E2 /* BTFuse.framework */; }; + 94B3ABF32CCECC6B00BD34E2 /* BTFuseNativeView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3ABF22CCECC6B00BD34E2 /* BTFuseNativeView.framework */; }; + 94B3AC0D2CCECDE700BD34E2 /* GoogleMaps.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC0A2CCECDE700BD34E2 /* GoogleMaps.xcframework */; }; + 94B3AC0F2CCECDE700BD34E2 /* GoogleMapsBase.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC0B2CCECDE700BD34E2 /* GoogleMapsBase.xcframework */; }; + 94B3AC112CCECDE700BD34E2 /* GoogleMapsCore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC0C2CCECDE700BD34E2 /* GoogleMapsCore.xcframework */; }; + 94B3AC142CCECDF600BD34E2 /* GoogleMaps.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC0A2CCECDE700BD34E2 /* GoogleMaps.xcframework */; }; + 94B3AC152CCECDF600BD34E2 /* GoogleMaps.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC0A2CCECDE700BD34E2 /* GoogleMaps.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 94B3AC162CCECDF600BD34E2 /* GoogleMapsBase.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC0B2CCECDE700BD34E2 /* GoogleMapsBase.xcframework */; }; + 94B3AC172CCECDF600BD34E2 /* GoogleMapsBase.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC0B2CCECDE700BD34E2 /* GoogleMapsBase.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 94B3AC182CCECDF600BD34E2 /* GoogleMapsCore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC0C2CCECDE700BD34E2 /* GoogleMapsCore.xcframework */; }; + 94B3AC192CCECDF600BD34E2 /* GoogleMapsCore.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC0C2CCECDE700BD34E2 /* GoogleMapsCore.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 94B3AC2B2CCECE3100BD34E2 /* BTFuseNativeView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC2A2CCECE3100BD34E2 /* BTFuseNativeView.framework */; }; + 94B3AC2C2CCECE3100BD34E2 /* BTFuseNativeView.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC2A2CCECE3100BD34E2 /* BTFuseNativeView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 94B3AC3E2CCEE32000BD34E2 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC3D2CCEE30A00BD34E2 /* libc++.tbd */; }; 94C9437C2B9F97EE009E2BBB /* BTFuseGoogleMapPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 94C9437B2B9F97EE009E2BBB /* BTFuseGoogleMapPlugin.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 94C943A32B9F99CE009E2BBB /* BTFuse.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94C943A22B9F99CE009E2BBB /* BTFuse.xcframework */; }; 94C943A92B9FA30F009E2BBB /* BTFuseGoogleMapPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 94C943A82B9FA30F009E2BBB /* BTFuseGoogleMapPlugin.m */; }; 94DFF0022BA780BA002C405A /* BTFuseGoogleMapComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 94DFF0012BA780BA002C405A /* BTFuseGoogleMapComponent.h */; settings = {ATTRIBUTES = (Public, ); }; }; 94DFF0042BA78157002C405A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94DFF0032BA78157002C405A /* UIKit.framework */; }; 94DFF0152BAA5C9F002C405A /* BTFuseGoogleMapComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 94DFF0142BAA5C9F002C405A /* BTFuseGoogleMapComponent.m */; }; - B9B433DD4BD09DF4C909A04D /* Pods_BTFuseGoogleMap.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 452662451065D40F95332820 /* Pods_BTFuseGoogleMap.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -31,22 +41,40 @@ }; /* End PBXContainerItemProxy section */ +/* Begin PBXCopyFilesBuildPhase section */ + 94B3AC1A2CCECDF600BD34E2 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 94B3AC192CCECDF600BD34E2 /* GoogleMapsCore.xcframework in Embed Frameworks */, + 94B3AC2C2CCECE3100BD34E2 /* BTFuseNativeView.framework in Embed Frameworks */, + 94B3AC172CCECDF600BD34E2 /* GoogleMapsBase.xcframework in Embed Frameworks */, + 94B3AC152CCECDF600BD34E2 /* GoogleMaps.xcframework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ - 11BDE97325B41D2A50BB9FA7 /* Pods-BTFuseGoogleMap.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BTFuseGoogleMap.release.xcconfig"; path = "Target Support Files/Pods-BTFuseGoogleMap/Pods-BTFuseGoogleMap.release.xcconfig"; sourceTree = ""; }; - 452662451065D40F95332820 /* Pods_BTFuseGoogleMap.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_BTFuseGoogleMap.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 940943EE2B9A488E008150D1 /* BTFuseGoogleMap.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BTFuseGoogleMap.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 940943F12B9A488E008150D1 /* BTFuseGoogleMap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BTFuseGoogleMap.h; sourceTree = ""; }; 940943F62B9A488E008150D1 /* BTFuseGoogleMapTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BTFuseGoogleMapTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 940943FB2B9A488E008150D1 /* BTFuseGoogleMapTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BTFuseGoogleMapTests.m; sourceTree = ""; }; - 9436BD692BF6CE7C00E1A268 /* BTFuseNativeView.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = BTFuseNativeView.xcframework; path = ../Pods/BTFuseNativeView/BTFuseNativeView.xcframework; sourceTree = ""; }; - 9436BD762BF6D33800E1A268 /* GoogleMaps.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = GoogleMaps.bundle; path = ../Pods/GoogleMaps/Maps/Resources/GoogleMapsResources/GoogleMaps.bundle; sourceTree = ""; }; + 94B3ABEE2CCECC5C00BD34E2 /* BTFuse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BTFuse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 94B3ABF22CCECC6B00BD34E2 /* BTFuseNativeView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BTFuseNativeView.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 94B3AC0A2CCECDE700BD34E2 /* GoogleMaps.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GoogleMaps.xcframework; path = ../../../../ios/third_party/com.breautek.btfuse.third_party/GoogleMaps.xcframework; sourceTree = ""; }; + 94B3AC0B2CCECDE700BD34E2 /* GoogleMapsBase.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GoogleMapsBase.xcframework; path = ../../../../ios/third_party/com.breautek.btfuse.third_party/GoogleMapsBase.xcframework; sourceTree = ""; }; + 94B3AC0C2CCECDE700BD34E2 /* GoogleMapsCore.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GoogleMapsCore.xcframework; path = ../../../../ios/third_party/com.breautek.btfuse.third_party/GoogleMapsCore.xcframework; sourceTree = ""; }; + 94B3AC2A2CCECE3100BD34E2 /* BTFuseNativeView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BTFuseNativeView.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 94B3AC3D2CCEE30A00BD34E2 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; 94C9437B2B9F97EE009E2BBB /* BTFuseGoogleMapPlugin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BTFuseGoogleMapPlugin.h; sourceTree = ""; }; - 94C943A22B9F99CE009E2BBB /* BTFuse.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = BTFuse.xcframework; path = ../Pods/BTFuse/BTFuse.xcframework; sourceTree = ""; }; 94C943A82B9FA30F009E2BBB /* BTFuseGoogleMapPlugin.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BTFuseGoogleMapPlugin.m; sourceTree = ""; }; 94DFF0012BA780BA002C405A /* BTFuseGoogleMapComponent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BTFuseGoogleMapComponent.h; sourceTree = ""; }; 94DFF0032BA78157002C405A /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 94DFF0142BAA5C9F002C405A /* BTFuseGoogleMapComponent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BTFuseGoogleMapComponent.m; sourceTree = ""; }; - CDB72F05DECA415CF1DD2146 /* Pods-BTFuseGoogleMap.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BTFuseGoogleMap.debug.xcconfig"; path = "Target Support Files/Pods-BTFuseGoogleMap/Pods-BTFuseGoogleMap.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -54,10 +82,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 94C943A32B9F99CE009E2BBB /* BTFuse.xcframework in Frameworks */, + 94B3AC3E2CCEE32000BD34E2 /* libc++.tbd in Frameworks */, + 94B3AC112CCECDE700BD34E2 /* GoogleMapsCore.xcframework in Frameworks */, + 94B3AC0F2CCECDE700BD34E2 /* GoogleMapsBase.xcframework in Frameworks */, 94DFF0042BA78157002C405A /* UIKit.framework in Frameworks */, - B9B433DD4BD09DF4C909A04D /* Pods_BTFuseGoogleMap.framework in Frameworks */, - 9436BD6A2BF6CE7C00E1A268 /* BTFuseNativeView.xcframework in Frameworks */, + 94B3ABEF2CCECC5C00BD34E2 /* BTFuse.framework in Frameworks */, + 94B3ABF32CCECC6B00BD34E2 /* BTFuseNativeView.framework in Frameworks */, + 94B3AC0D2CCECDE700BD34E2 /* GoogleMaps.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -65,7 +96,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 94B3AC182CCECDF600BD34E2 /* GoogleMapsCore.xcframework in Frameworks */, 940943F72B9A488E008150D1 /* BTFuseGoogleMap.framework in Frameworks */, + 94B3AC162CCECDF600BD34E2 /* GoogleMapsBase.xcframework in Frameworks */, + 94B3AC142CCECDF600BD34E2 /* GoogleMaps.xcframework in Frameworks */, + 94B3AC2B2CCECE3100BD34E2 /* BTFuseNativeView.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -75,11 +110,9 @@ 940943E42B9A488D008150D1 = { isa = PBXGroup; children = ( - 9436BD762BF6D33800E1A268 /* GoogleMaps.bundle */, 940943F02B9A488E008150D1 /* BTFuseGoogleMap */, 940943FA2B9A488E008150D1 /* BTFuseGoogleMapTests */, 940943EF2B9A488E008150D1 /* Products */, - A24AD12750E4C2D072CC0ADB /* Pods */, ADB3996AE657A8884EFA8A7A /* Frameworks */, ); sourceTree = ""; @@ -129,23 +162,17 @@ path = src; sourceTree = ""; }; - A24AD12750E4C2D072CC0ADB /* Pods */ = { - isa = PBXGroup; - children = ( - CDB72F05DECA415CF1DD2146 /* Pods-BTFuseGoogleMap.debug.xcconfig */, - 11BDE97325B41D2A50BB9FA7 /* Pods-BTFuseGoogleMap.release.xcconfig */, - ); - name = Pods; - path = ../Pods; - sourceTree = ""; - }; ADB3996AE657A8884EFA8A7A /* Frameworks */ = { isa = PBXGroup; children = ( - 9436BD692BF6CE7C00E1A268 /* BTFuseNativeView.xcframework */, + 94B3AC3D2CCEE30A00BD34E2 /* libc++.tbd */, + 94B3AC2A2CCECE3100BD34E2 /* BTFuseNativeView.framework */, + 94B3AC0A2CCECDE700BD34E2 /* GoogleMaps.xcframework */, + 94B3AC0B2CCECDE700BD34E2 /* GoogleMapsBase.xcframework */, + 94B3AC0C2CCECDE700BD34E2 /* GoogleMapsCore.xcframework */, + 94B3ABF22CCECC6B00BD34E2 /* BTFuseNativeView.framework */, + 94B3ABEE2CCECC5C00BD34E2 /* BTFuse.framework */, 94DFF0032BA78157002C405A /* UIKit.framework */, - 94C943A22B9F99CE009E2BBB /* BTFuse.xcframework */, - 452662451065D40F95332820 /* Pods_BTFuseGoogleMap.framework */, ); name = Frameworks; sourceTree = ""; @@ -170,12 +197,10 @@ isa = PBXNativeTarget; buildConfigurationList = 940944002B9A488E008150D1 /* Build configuration list for PBXNativeTarget "BTFuseGoogleMap" */; buildPhases = ( - 425DD70100F4C1C5261BE612 /* [CP] Check Pods Manifest.lock */, 940943E92B9A488E008150D1 /* Headers */, 940943EA2B9A488E008150D1 /* Sources */, 940943EB2B9A488E008150D1 /* Frameworks */, 940943EC2B9A488E008150D1 /* Resources */, - BBD3ACD2885E480F707D8DD5 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -193,6 +218,7 @@ 940943F22B9A488E008150D1 /* Sources */, 940943F32B9A488E008150D1 /* Frameworks */, 940943F42B9A488E008150D1 /* Resources */, + 94B3AC1A2CCECDF600BD34E2 /* Embed Frameworks */, ); buildRules = ( ); @@ -245,7 +271,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9436BD772BF6D33800E1A268 /* GoogleMaps.bundle in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -258,48 +283,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 425DD70100F4C1C5261BE612 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-BTFuseGoogleMap-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - BBD3ACD2885E480F707D8DD5 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-BTFuseGoogleMap/Pods-BTFuseGoogleMap-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-BTFuseGoogleMap/Pods-BTFuseGoogleMap-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-BTFuseGoogleMap/Pods-BTFuseGoogleMap-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 940943EA2B9A488E008150D1 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -453,7 +436,6 @@ }; 940944012B9A488E008150D1 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CDB72F05DECA415CF1DD2146 /* Pods-BTFuseGoogleMap.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -483,13 +465,12 @@ SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_EMIT_LOC_STRINGS = YES; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = Debug; }; 940944022B9A488E008150D1 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 11BDE97325B41D2A50BB9FA7 /* Pods-BTFuseGoogleMap.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -519,7 +500,7 @@ SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_EMIT_LOC_STRINGS = YES; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = Release; }; @@ -533,8 +514,12 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.breautek.fuse.BTFuseGoogleMapTests; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_EMIT_LOC_STRINGS = NO; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = Debug; }; @@ -548,8 +533,12 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.breautek.fuse.BTFuseGoogleMapTests; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_EMIT_LOC_STRINGS = NO; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = Release; }; diff --git a/plugins/google-maps/ios/BTFuseGoogleMap/BTFuseGoogleMap/src/BTFuseGoogleMapPlugin.m b/plugins/google-maps/ios/BTFuseGoogleMap/BTFuseGoogleMap/src/BTFuseGoogleMapPlugin.m index d003251..eb3cf29 100644 --- a/plugins/google-maps/ios/BTFuseGoogleMap/BTFuseGoogleMap/src/BTFuseGoogleMapPlugin.m +++ b/plugins/google-maps/ios/BTFuseGoogleMap/BTFuseGoogleMap/src/BTFuseGoogleMapPlugin.m @@ -50,7 +50,7 @@ - (void) initHandles { BTFuseGoogleMapPlugin* strongSelf = weakSelf; NSError* error = nil; - NSDictionary* params = [packet readAsJSONObject: error]; + NSDictionary* params = [packet readAsJSONObject: &error]; if (error != nil) { [response sendError:[ [BTFuseError alloc] diff --git a/plugins/google-maps/ios/GoogleMap Test App/GoogleMap Test App.xcodeproj/project.pbxproj b/plugins/google-maps/ios/GoogleMap Test App/GoogleMap Test App.xcodeproj/project.pbxproj index 685ca01..cbb35a9 100644 --- a/plugins/google-maps/ios/GoogleMap Test App/GoogleMap Test App.xcodeproj/project.pbxproj +++ b/plugins/google-maps/ios/GoogleMap Test App/GoogleMap Test App.xcodeproj/project.pbxproj @@ -10,6 +10,16 @@ 9436BD732BF6CFD600E1A268 /* BTFuseGoogleMap.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9436BD722BF6CFD600E1A268 /* BTFuseGoogleMap.framework */; }; 9436BD742BF6CFD600E1A268 /* BTFuseGoogleMap.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9436BD722BF6CFD600E1A268 /* BTFuseGoogleMap.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 9436BD792BF6D80900E1A268 /* secrets.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9436BD782BF6D80900E1A268 /* secrets.plist */; }; + 94B3AC202CCECE2300BD34E2 /* BTFuse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC1B2CCECE2300BD34E2 /* BTFuse.framework */; }; + 94B3AC212CCECE2300BD34E2 /* BTFuse.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC1B2CCECE2300BD34E2 /* BTFuse.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 94B3AC222CCECE2300BD34E2 /* BTFuseNativeView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC1C2CCECE2300BD34E2 /* BTFuseNativeView.framework */; }; + 94B3AC232CCECE2300BD34E2 /* BTFuseNativeView.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC1C2CCECE2300BD34E2 /* BTFuseNativeView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 94B3AC242CCECE2300BD34E2 /* GoogleMaps.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC1D2CCECE2300BD34E2 /* GoogleMaps.xcframework */; }; + 94B3AC252CCECE2300BD34E2 /* GoogleMaps.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC1D2CCECE2300BD34E2 /* GoogleMaps.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 94B3AC262CCECE2300BD34E2 /* GoogleMapsBase.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC1E2CCECE2300BD34E2 /* GoogleMapsBase.xcframework */; }; + 94B3AC272CCECE2300BD34E2 /* GoogleMapsBase.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC1E2CCECE2300BD34E2 /* GoogleMapsBase.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 94B3AC282CCECE2300BD34E2 /* GoogleMapsCore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC1F2CCECE2300BD34E2 /* GoogleMapsCore.xcframework */; }; + 94B3AC292CCECE2300BD34E2 /* GoogleMapsCore.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3AC1F2CCECE2300BD34E2 /* GoogleMapsCore.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 94C9438B2B9F9982009E2BBB /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 94C9438A2B9F9982009E2BBB /* AppDelegate.m */; }; 94C9438E2B9F9982009E2BBB /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 94C9438D2B9F9982009E2BBB /* SceneDelegate.m */; }; 94C943912B9F9982009E2BBB /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 94C943902B9F9982009E2BBB /* ViewController.m */; }; @@ -18,7 +28,6 @@ 94C943992B9F9983009E2BBB /* Base in Resources */ = {isa = PBXBuildFile; fileRef = 94C943982B9F9983009E2BBB /* Base */; }; 94C9439C2B9F9983009E2BBB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 94C9439B2B9F9983009E2BBB /* main.m */; }; 94DFF0062BA784CF002C405A /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 94DFF0052BA784CF002C405A /* assets */; }; - B9AF5D8E4A78DA7BE5A3EE54 /* Pods_GoogleMap_Test_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 723364237B139A17196127E1 /* Pods_GoogleMap_Test_App.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -28,7 +37,12 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + 94B3AC292CCECE2300BD34E2 /* GoogleMapsCore.xcframework in Embed Frameworks */, + 94B3AC272CCECE2300BD34E2 /* GoogleMapsBase.xcframework in Embed Frameworks */, 9436BD742BF6CFD600E1A268 /* BTFuseGoogleMap.framework in Embed Frameworks */, + 94B3AC212CCECE2300BD34E2 /* BTFuse.framework in Embed Frameworks */, + 94B3AC232CCECE2300BD34E2 /* BTFuseNativeView.framework in Embed Frameworks */, + 94B3AC252CCECE2300BD34E2 /* GoogleMaps.xcframework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -36,12 +50,29 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 35776DD8784047BC3FCE923A /* Pods-GoogleMap Test App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMap Test App.release.xcconfig"; path = "Target Support Files/Pods-GoogleMap Test App/Pods-GoogleMap Test App.release.xcconfig"; sourceTree = ""; }; - 723364237B139A17196127E1 /* Pods_GoogleMap_Test_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GoogleMap_Test_App.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 86F73885BE827AD1A3A84B87 /* Pods-GoogleMap Test App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMap Test App.debug.xcconfig"; path = "Target Support Files/Pods-GoogleMap Test App/Pods-GoogleMap Test App.debug.xcconfig"; sourceTree = ""; }; - 9436BD6F2BF6CF0F00E1A268 /* BTFuseNativeView.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = BTFuseNativeView.xcframework; path = ../Pods/BTFuseNativeView/BTFuseNativeView.xcframework; sourceTree = ""; }; 9436BD722BF6CFD600E1A268 /* BTFuseGoogleMap.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BTFuseGoogleMap.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9436BD782BF6D80900E1A268 /* secrets.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = secrets.plist; sourceTree = ""; }; + 94B3AC1B2CCECE2300BD34E2 /* BTFuse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BTFuse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 94B3AC1C2CCECE2300BD34E2 /* BTFuseNativeView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BTFuseNativeView.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 94B3AC1D2CCECE2300BD34E2 /* GoogleMaps.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GoogleMaps.xcframework; path = ../../../../ios/third_party/com.breautek.btfuse.third_party/GoogleMaps.xcframework; sourceTree = ""; }; + 94B3AC1E2CCECE2300BD34E2 /* GoogleMapsBase.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GoogleMapsBase.xcframework; path = ../../../../ios/third_party/com.breautek.btfuse.third_party/GoogleMapsBase.xcframework; sourceTree = ""; }; + 94B3AC1F2CCECE2300BD34E2 /* GoogleMapsCore.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GoogleMapsCore.xcframework; path = ../../../../ios/third_party/com.breautek.btfuse.third_party/GoogleMapsCore.xcframework; sourceTree = ""; }; + 94B3AC2D2CCED0D800BD34E2 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; + 94B3AC2E2CCED0D800BD34E2 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; + 94B3AC2F2CCED0D800BD34E2 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; + 94B3AC302CCED0D800BD34E2 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; }; + 94B3AC312CCED0D800BD34E2 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; }; + 94B3AC322CCED0D800BD34E2 /* Contacts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Contacts.framework; path = System/Library/Frameworks/Contacts.framework; sourceTree = SDKROOT; }; + 94B3AC332CCED0D800BD34E2 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; + 94B3AC342CCED0D800BD34E2 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; + 94B3AC352CCED0D800BD34E2 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; + 94B3AC362CCED0D800BD34E2 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; + 94B3AC372CCED0D800BD34E2 /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; }; + 94B3AC382CCED0D800BD34E2 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + 94B3AC392CCED0D800BD34E2 /* CoreImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreImage.framework; path = System/Library/Frameworks/CoreImage.framework; sourceTree = SDKROOT; }; + 94B3AC3A2CCED0D800BD34E2 /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; }; + 94B3AC3B2CCED0D800BD34E2 /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; }; + 94B3AC3C2CCED0D800BD34E2 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 94C943862B9F9982009E2BBB /* GoogleMap Test App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "GoogleMap Test App.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 94C943892B9F9982009E2BBB /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 94C9438A2B9F9982009E2BBB /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; @@ -64,32 +95,45 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B9AF5D8E4A78DA7BE5A3EE54 /* Pods_GoogleMap_Test_App.framework in Frameworks */, + 94B3AC282CCECE2300BD34E2 /* GoogleMapsCore.xcframework in Frameworks */, + 94B3AC262CCECE2300BD34E2 /* GoogleMapsBase.xcframework in Frameworks */, 9436BD732BF6CFD600E1A268 /* BTFuseGoogleMap.framework in Frameworks */, + 94B3AC202CCECE2300BD34E2 /* BTFuse.framework in Frameworks */, + 94B3AC222CCECE2300BD34E2 /* BTFuseNativeView.framework in Frameworks */, + 94B3AC242CCECE2300BD34E2 /* GoogleMaps.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 1096A0416F312CD1548BA769 /* Pods */ = { - isa = PBXGroup; - children = ( - 86F73885BE827AD1A3A84B87 /* Pods-GoogleMap Test App.debug.xcconfig */, - 35776DD8784047BC3FCE923A /* Pods-GoogleMap Test App.release.xcconfig */, - ); - name = Pods; - path = ../Pods; - sourceTree = ""; - }; 8223275C0D2FE84C57A7780F /* Frameworks */ = { isa = PBXGroup; children = ( + 94B3AC312CCED0D800BD34E2 /* Accelerate.framework */, + 94B3AC322CCED0D800BD34E2 /* Contacts.framework */, + 94B3AC2F2CCED0D800BD34E2 /* CoreData.framework */, + 94B3AC382CCED0D800BD34E2 /* CoreGraphics.framework */, + 94B3AC392CCED0D800BD34E2 /* CoreImage.framework */, + 94B3AC352CCED0D800BD34E2 /* CoreLocation.framework */, + 94B3AC2E2CCED0D800BD34E2 /* CoreTelephony.framework */, + 94B3AC302CCED0D800BD34E2 /* CoreText.framework */, + 94B3AC3B2CCED0D800BD34E2 /* GLKit.framework */, + 94B3AC372CCED0D800BD34E2 /* ImageIO.framework */, + 94B3AC362CCED0D800BD34E2 /* libc++.tbd */, + 94B3AC2D2CCED0D800BD34E2 /* libz.tbd */, + 94B3AC3A2CCED0D800BD34E2 /* Metal.framework */, + 94B3AC332CCED0D800BD34E2 /* QuartzCore.framework */, + 94B3AC3C2CCED0D800BD34E2 /* SystemConfiguration.framework */, + 94B3AC342CCED0D800BD34E2 /* UIKit.framework */, + 94B3AC1B2CCECE2300BD34E2 /* BTFuse.framework */, + 94B3AC1C2CCECE2300BD34E2 /* BTFuseNativeView.framework */, + 94B3AC1D2CCECE2300BD34E2 /* GoogleMaps.xcframework */, + 94B3AC1E2CCECE2300BD34E2 /* GoogleMapsBase.xcframework */, + 94B3AC1F2CCECE2300BD34E2 /* GoogleMapsCore.xcframework */, 9436BD722BF6CFD600E1A268 /* BTFuseGoogleMap.framework */, - 9436BD6F2BF6CF0F00E1A268 /* BTFuseNativeView.xcframework */, 94DFF0112BAA5C6F002C405A /* BTFuseGoogleMap.framework */, 94DFF00B2BAA5A5C002C405A /* BTFuse.xcframework */, - 723364237B139A17196127E1 /* Pods_GoogleMap_Test_App.framework */, ); name = Frameworks; sourceTree = ""; @@ -99,7 +143,6 @@ children = ( 94C943882B9F9982009E2BBB /* GoogleMap Test App */, 94C943872B9F9982009E2BBB /* Products */, - 1096A0416F312CD1548BA769 /* Pods */, 8223275C0D2FE84C57A7780F /* Frameworks */, ); sourceTree = ""; @@ -139,11 +182,9 @@ isa = PBXNativeTarget; buildConfigurationList = 94C9439F2B9F9983009E2BBB /* Build configuration list for PBXNativeTarget "GoogleMap Test App" */; buildPhases = ( - FDEB4156A6585AC308066461 /* [CP] Check Pods Manifest.lock */, 94C943822B9F9982009E2BBB /* Sources */, 94C943832B9F9982009E2BBB /* Frameworks */, 94C943842B9F9982009E2BBB /* Resources */, - 48B3A4EBE9ADF94B03690A6F /* [CP] Embed Pods Frameworks */, 9436BD752BF6CFD600E1A268 /* Embed Frameworks */, ); buildRules = ( @@ -202,48 +243,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 48B3A4EBE9ADF94B03690A6F /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-GoogleMap Test App/Pods-GoogleMap Test App-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-GoogleMap Test App/Pods-GoogleMap Test App-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMap Test App/Pods-GoogleMap Test App-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - FDEB4156A6585AC308066461 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-GoogleMap Test App-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 94C943822B9F9982009E2BBB /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -396,7 +395,6 @@ }; 94C943A02B9F9983009E2BBB /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 86F73885BE827AD1A3A84B87 /* Pods-GoogleMap Test App.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -422,13 +420,12 @@ SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_EMIT_LOC_STRINGS = YES; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = Debug; }; 94C943A12B9F9983009E2BBB /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 35776DD8784047BC3FCE923A /* Pods-GoogleMap Test App.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -454,7 +451,7 @@ SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_EMIT_LOC_STRINGS = YES; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = Release; }; diff --git a/plugins/google-maps/ios/Podfile b/plugins/google-maps/ios/Podfile deleted file mode 100644 index 0330bc1..0000000 --- a/plugins/google-maps/ios/Podfile +++ /dev/null @@ -1,24 +0,0 @@ - -platform :ios, '15.0' - -workspace 'BTFuseGoogleMap.xcworkspace' - -source 'https://github.com/CocoaPods/Specs.git' -source 'https://github.com/breautek/pods.git' - -target 'BTFuseGoogleMap' do - use_frameworks! - project 'BTFuseGoogleMap/BTFuseGoogleMap.xcodeproj' - - pod 'BTFuse', '0.8.8' - pod 'GoogleMaps', '8.4.0' - pod 'BTFuseNativeView', '0.1.3' -end - -target 'GoogleMap Test App' do - use_frameworks! - project 'GoogleMap Test App/GoogleMap Test App.xcodeproj' - - pod 'BTFuse', '0.8.8' - pod 'BTFuseNativeView', '0.1.3' -end diff --git a/plugins/google-maps/ios/Podfile.lock b/plugins/google-maps/ios/Podfile.lock deleted file mode 100644 index eac451a..0000000 --- a/plugins/google-maps/ios/Podfile.lock +++ /dev/null @@ -1,29 +0,0 @@ -PODS: - - BTFuse (0.8.8) - - BTFuseNativeView (0.1.3) - - GoogleMaps (8.4.0): - - GoogleMaps/Maps (= 8.4.0) - - GoogleMaps/Base (8.4.0) - - GoogleMaps/Maps (8.4.0): - - GoogleMaps/Base - -DEPENDENCIES: - - BTFuse (= 0.8.8) - - BTFuseNativeView (= 0.1.3) - - GoogleMaps (= 8.4.0) - -SPEC REPOS: - https://github.com/breautek/pods.git: - - BTFuse - - BTFuseNativeView - https://github.com/CocoaPods/Specs.git: - - GoogleMaps - -SPEC CHECKSUMS: - BTFuse: 4a2e9844c80e61a08a8de5f8d02a2ed07161a5d4 - BTFuseNativeView: dd6ec36d3362fc48f164a3c0cc9287336a149088 - GoogleMaps: 8939898920281c649150e0af74aa291c60f2e77d - -PODFILE CHECKSUM: 35f662bfa27f091e40abb7930749c11edd933fbb - -COCOAPODS: 1.15.2 diff --git a/plugins/native-view/ios/BTFuseNativeView/BTFuseNativeView.xcodeproj/project.pbxproj b/plugins/native-view/ios/BTFuseNativeView/BTFuseNativeView.xcodeproj/project.pbxproj index aa747df..229ddb6 100644 --- a/plugins/native-view/ios/BTFuseNativeView/BTFuseNativeView.xcodeproj/project.pbxproj +++ b/plugins/native-view/ios/BTFuseNativeView/BTFuseNativeView.xcodeproj/project.pbxproj @@ -29,11 +29,11 @@ 9471FB262BDDC15F00E92F50 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 9471FB252BDDC15F00E92F50 /* assets */; }; 9471FB282BE997B400E92F50 /* BTFuseNativeViewWebviewOverlayController.h in Headers */ = {isa = PBXBuildFile; fileRef = 9471FB272BE997B400E92F50 /* BTFuseNativeViewWebviewOverlayController.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9471FB2A2BE9980A00E92F50 /* BTFuseNativeViewWebviewOverlayController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9471FB292BE9980A00E92F50 /* BTFuseNativeViewWebviewOverlayController.m */; }; - 94B3ABD32CCE8A3200BD34E2 /* BTFuse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3ABD22CCE8A3200BD34E2 /* BTFuse.framework */; }; - 94B3ABD72CCE8A4F00BD34E2 /* BTFuseTestTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3ABD62CCE8A4F00BD34E2 /* BTFuseTestTools.framework */; }; - 94B3ABD82CCE8A4F00BD34E2 /* BTFuseTestTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3ABD62CCE8A4F00BD34E2 /* BTFuseTestTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 94B3ABDA2CCE8A5A00BD34E2 /* BTFuseNativeView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 941F224E2B87D2AA005DCE20 /* BTFuseNativeView.framework */; }; 94B3ABDB2CCE8A5A00BD34E2 /* BTFuseNativeView.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 941F224E2B87D2AA005DCE20 /* BTFuseNativeView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 94B3ABFA2CCECCDC00BD34E2 /* BTFuse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3ABF92CCECCDC00BD34E2 /* BTFuse.framework */; }; + 94B3ABFE2CCECCF600BD34E2 /* BTFuseTestTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3ABFD2CCECCF600BD34E2 /* BTFuseTestTools.framework */; }; + 94B3ABFF2CCECCF600BD34E2 /* BTFuseTestTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3ABFD2CCECCF600BD34E2 /* BTFuseTestTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -53,8 +53,8 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 94B3ABD82CCE8A4F00BD34E2 /* BTFuseTestTools.framework in Embed Frameworks */, 94B3ABDB2CCE8A5A00BD34E2 /* BTFuseNativeView.framework in Embed Frameworks */, + 94B3ABFF2CCECCF600BD34E2 /* BTFuseTestTools.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -62,12 +62,10 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 206223B8984508E34997CA46 /* Pods_BTFuseNativeView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_BTFuseNativeView.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 941F224E2B87D2AA005DCE20 /* BTFuseNativeView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BTFuseNativeView.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 941F22512B87D2AA005DCE20 /* BTFuseNativeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BTFuseNativeView.h; sourceTree = ""; }; 941F22562B87D2AA005DCE20 /* BTFuseNativeViewTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BTFuseNativeViewTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 941F225B2B87D2AA005DCE20 /* BTFuseNativeViewTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BTFuseNativeViewTests.m; sourceTree = ""; }; - 941F22662B87D46E005DCE20 /* BTFuse.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = BTFuse.xcframework; path = ../Pods/BTFuse/BTFuse.xcframework; sourceTree = ""; }; 941F226C2B87D4CA005DCE20 /* BTFuseNativeViewPlugin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BTFuseNativeViewPlugin.h; sourceTree = ""; }; 941F226E2B87D511005DCE20 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 941F22702B87D5D5005DCE20 /* BTFuseNativeViewPlugin.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BTFuseNativeViewPlugin.m; sourceTree = ""; }; @@ -91,8 +89,8 @@ 9471FB252BDDC15F00E92F50 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; path = assets; sourceTree = ""; }; 9471FB272BE997B400E92F50 /* BTFuseNativeViewWebviewOverlayController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BTFuseNativeViewWebviewOverlayController.h; sourceTree = ""; }; 9471FB292BE9980A00E92F50 /* BTFuseNativeViewWebviewOverlayController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BTFuseNativeViewWebviewOverlayController.m; sourceTree = ""; }; - 94B3ABD22CCE8A3200BD34E2 /* BTFuse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BTFuse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 94B3ABD62CCE8A4F00BD34E2 /* BTFuseTestTools.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BTFuseTestTools.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 94B3ABF92CCECCDC00BD34E2 /* BTFuse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BTFuse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 94B3ABFD2CCECCF600BD34E2 /* BTFuseTestTools.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BTFuseTestTools.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -101,8 +99,8 @@ buildActionMask = 2147483647; files = ( 9471FB1E2BDB4AB800E92F50 /* WebKit.framework in Frameworks */, + 94B3ABFA2CCECCDC00BD34E2 /* BTFuse.framework in Frameworks */, 946395572BB89EEF00FCCF77 /* CoreGraphics.framework in Frameworks */, - 94B3ABD32CCE8A3200BD34E2 /* BTFuse.framework in Frameworks */, 941F22752B87DDA4005DCE20 /* UIKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -111,8 +109,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 94B3ABD72CCE8A4F00BD34E2 /* BTFuseTestTools.framework in Frameworks */, 94B3ABDA2CCE8A5A00BD34E2 /* BTFuseNativeView.framework in Frameworks */, + 94B3ABFE2CCECCF600BD34E2 /* BTFuseTestTools.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -193,13 +191,11 @@ 94540C036690349DAD208FDF /* Frameworks */ = { isa = PBXGroup; children = ( - 94B3ABD62CCE8A4F00BD34E2 /* BTFuseTestTools.framework */, - 94B3ABD22CCE8A3200BD34E2 /* BTFuse.framework */, + 94B3ABFD2CCECCF600BD34E2 /* BTFuseTestTools.framework */, + 94B3ABF92CCECCDC00BD34E2 /* BTFuse.framework */, 9471FB1D2BDB4AB800E92F50 /* WebKit.framework */, 946395562BB89EEF00FCCF77 /* CoreGraphics.framework */, 941F22742B87DDA4005DCE20 /* UIKit.framework */, - 941F22662B87D46E005DCE20 /* BTFuse.xcframework */, - 206223B8984508E34997CA46 /* Pods_BTFuseNativeView.framework */, ); name = Frameworks; sourceTree = ""; diff --git a/plugins/native-view/ios/TestApp/BTFuseNativeViewTestApp.xcodeproj/project.pbxproj b/plugins/native-view/ios/TestApp/BTFuseNativeViewTestApp.xcodeproj/project.pbxproj index cbf06df..6cfc6f3 100644 --- a/plugins/native-view/ios/TestApp/BTFuseNativeViewTestApp.xcodeproj/project.pbxproj +++ b/plugins/native-view/ios/TestApp/BTFuseNativeViewTestApp.xcodeproj/project.pbxproj @@ -17,6 +17,8 @@ 941F22A42B8AD237005DCE20 /* BTFuseNativeView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 941F22A32B8AD237005DCE20 /* BTFuseNativeView.framework */; }; 941F22A52B8AD237005DCE20 /* BTFuseNativeView.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 941F22A32B8AD237005DCE20 /* BTFuseNativeView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 941F22A82B8AD2C7005DCE20 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 941F22A72B8AD2C7005DCE20 /* assets */; }; + 94B3ABF72CCECCB000BD34E2 /* BTFuse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3ABF62CCECCB000BD34E2 /* BTFuse.framework */; }; + 94B3ABF82CCECCB000BD34E2 /* BTFuse.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 94B3ABF62CCECCB000BD34E2 /* BTFuse.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -27,6 +29,7 @@ dstSubfolderSpec = 10; files = ( 941F22A52B8AD237005DCE20 /* BTFuseNativeView.framework in Embed Frameworks */, + 94B3ABF82CCECCB000BD34E2 /* BTFuse.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -49,7 +52,7 @@ 941F229F2B8AD230005DCE20 /* BTFuse.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = BTFuse.xcframework; path = "/Users/norman/development/breautek/fuse-native-view/ios/BTFuseNativeView/../Pods/BTFuse/BTFuse.xcframework"; sourceTree = ""; }; 941F22A32B8AD237005DCE20 /* BTFuseNativeView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BTFuseNativeView.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 941F22A72B8AD2C7005DCE20 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = assets; path = TestApp/assets; sourceTree = ""; }; - BE8182E3E51FEFB4EEDE6DCE /* Pods_TestApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TestApp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 94B3ABF62CCECCB000BD34E2 /* BTFuse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BTFuse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -58,6 +61,7 @@ buildActionMask = 2147483647; files = ( 941F22A42B8AD237005DCE20 /* BTFuseNativeView.framework in Frameworks */, + 94B3ABF72CCECCB000BD34E2 /* BTFuse.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -67,9 +71,9 @@ 525AAE6DEF6B898814EFB4A5 /* Frameworks */ = { isa = PBXGroup; children = ( + 94B3ABF62CCECCB000BD34E2 /* BTFuse.framework */, 941F22A32B8AD237005DCE20 /* BTFuseNativeView.framework */, 941F229F2B8AD230005DCE20 /* BTFuse.xcframework */, - BE8182E3E51FEFB4EEDE6DCE /* Pods_TestApp.framework */, ); name = Frameworks; sourceTree = ""; diff --git a/test-app/ios/testapp.xcodeproj/project.pbxproj b/test-app/ios/testapp.xcodeproj/project.pbxproj index 4ca4c09..f473a1b 100644 --- a/test-app/ios/testapp.xcodeproj/project.pbxproj +++ b/test-app/ios/testapp.xcodeproj/project.pbxproj @@ -208,7 +208,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Type a script or drag a script file from your workspace to insert its path.\npwd\n./scripts/build.sh ./testapp/assets\n"; + shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n./scripts/build.sh ./testapp/assets\n"; }; /* End PBXShellScriptBuildPhase section */ diff --git a/test-app/ios/testapp/assets/assets/index.html b/test-app/ios/testapp/assets/assets/index.html new file mode 100644 index 0000000..8f13f6f --- /dev/null +++ b/test-app/ios/testapp/assets/assets/index.html @@ -0,0 +1,10 @@ + + + + My First Fuse Application + + + + + + \ No newline at end of file