Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .github/workflows/prepare_dev_for_next_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ name: Prepare dev branch for next release

on:
push:
branches: [main]
tags:
- 'v*'

permissions:
contents: write
Expand All @@ -11,7 +12,7 @@ jobs:
update-pods:
name: Update Podfile.lock after release
runs-on: macos-latest
if: contains(join(github.event.commits.*.message, ' '), 'release')
if: ${{ !contains(github.ref_name, '-') }}
env:
XCODE_VERSION: latest-stable

Expand All @@ -21,6 +22,7 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}
fetch-depth: 0
ref: main

- name: Setup
uses: ./.github/actions/setup
Expand All @@ -41,14 +43,14 @@ jobs:
exit 0
fi

git commit -m "chore(example): update Podfile.lock after release [skip ci]"
git push
git commit -m "chore(example): update Podfile.lock after release"
git push origin main

sync-dev:
name: Merge main into dev
runs-on: ubuntu-latest
needs: update-pods
if: contains(join(github.event.commits.*.message, ' '), 'release')
if: ${{ !contains(github.ref_name, '-') }}
steps:
- name: Checkout
uses: actions/checkout@v5.0.0
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22
22.11.0
2 changes: 1 addition & 1 deletion RNGoogleMapsPlus.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Pod::Spec.new do |s|
s.dependency 'React-jsi'
s.dependency 'React-callinvoker'

s.dependency 'GoogleMaps', '10.8.0'
s.dependency 'GoogleMaps', '10.10.0'
s.dependency 'Google-Maps-iOS-Utils', '7.0.0'
s.dependency 'SVGKit', '3.0.0'

Expand Down
4 changes: 2 additions & 2 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ react {

/* Variants */
// The list of variants to that are debuggable. For those we're going to
// skip the bundling of the JS bundle and the assets. By default is just 'debug'.
// skip the bundling of the JS bundle and the assets. Default is "debug", "debugOptimized".
// If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
// debuggableVariants = ["liteDebug", "prodDebug"]
// debuggableVariants = ["liteDebug", "liteDebugOptimized", "prodDebug", "prodDebugOptimized"]

/* Bundling */
// A list containing the node command and its flags. Default is just 'node'.
Expand Down
38 changes: 36 additions & 2 deletions example/ios/GoogleMapsPlusExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,10 @@
);
PRODUCT_BUNDLE_IDENTIFIER = rngooglemapsplus.example;
PRODUCT_NAME = GoogleMapsPlusExample;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
};
name = Debug;
Expand Down Expand Up @@ -341,7 +343,9 @@
);
PRODUCT_BUNDLE_IDENTIFIER = rngooglemapsplus.example;
PRODUCT_NAME = GoogleMapsPlusExample;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
};
name = Release;
Expand Down Expand Up @@ -407,6 +411,16 @@
"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios",
"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers",
"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers/platform/ios",
"${PODS_ROOT}/ReactCommon",
"${PODS_ROOT}/ReactCommon/react/nativemodule/core",
"${PODS_ROOT}/React-runtimeexecutor",
"${PODS_ROOT}/React-runtimeexecutor/platform/ios",
"${PODS_ROOT}/ReactCommon-Samples",
"${PODS_ROOT}/ReactCommon-Samples/platform/ios",
"${PODS_ROOT}/React-Fabric/react/renderer/components/view/platform/cxx",
"${PODS_ROOT}/React-NativeModulesApple",
"${PODS_ROOT}/React-graphics",
"${PODS_ROOT}/React-graphics/react/renderer/graphics/platform/ios",
);
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -420,14 +434,18 @@
);
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
OTHER_CFLAGS = (
"$(inherited)",
"-DRCT_REMOVE_LEGACY_ARCH=1",
);
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-DFOLLY_NO_CONFIG",
"-DFOLLY_MOBILE=1",
"-DFOLLY_USE_LIBCPP=1",
"-DFOLLY_CFG_NO_COROUTINES=1",
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
"-DRCT_REMOVE_LEGACY_ARCH=1",
);
OTHER_LDFLAGS = (
"$(inherited)",
Expand All @@ -437,6 +455,7 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_ENABLE_EXPLICIT_MODULES = NO;
USE_HERMES = true;
};
name = Debug;
Expand Down Expand Up @@ -495,6 +514,16 @@
"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios",
"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers",
"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers/platform/ios",
"${PODS_ROOT}/ReactCommon",
"${PODS_ROOT}/ReactCommon/react/nativemodule/core",
"${PODS_ROOT}/React-runtimeexecutor",
"${PODS_ROOT}/React-runtimeexecutor/platform/ios",
"${PODS_ROOT}/ReactCommon-Samples",
"${PODS_ROOT}/ReactCommon-Samples/platform/ios",
"${PODS_ROOT}/React-Fabric/react/renderer/components/view/platform/cxx",
"${PODS_ROOT}/React-NativeModulesApple",
"${PODS_ROOT}/React-graphics",
"${PODS_ROOT}/React-graphics/react/renderer/graphics/platform/ios",
);
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -507,14 +536,18 @@
"\"$(inherited)\"",
);
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_CFLAGS = (
"$(inherited)",
"-DRCT_REMOVE_LEGACY_ARCH=1",
);
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-DFOLLY_NO_CONFIG",
"-DFOLLY_MOBILE=1",
"-DFOLLY_USE_LIBCPP=1",
"-DFOLLY_CFG_NO_COROUTINES=1",
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
"-DRCT_REMOVE_LEGACY_ARCH=1",
);
OTHER_LDFLAGS = (
"$(inherited)",
Expand All @@ -523,6 +556,7 @@
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_ENABLE_EXPLICIT_MODULES = NO;
USE_HERMES = true;
VALIDATE_PRODUCT = YES;
};
Expand Down
6 changes: 6 additions & 0 deletions example/ios/GoogleMapsPlusExample/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<string>$(MAPS_API_KEY)</string>
<key>NSAppTransportSecurity</key>
<dict>
<!-- Do not change NSAllowsArbitraryLoads to true, or you will risk app rejection! -->
<key>NSAllowsArbitraryLoads</key>
<false/>
<key>NSAllowsLocalNetworking</key>
Expand All @@ -48,8 +49,13 @@
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
Expand Down
Loading
Loading