Skip to content

Commit 39bc703

Browse files
pinpongpinpong
authored
chore: merge dev into main
2 parents 0e36000 + 94f62e7 commit 39bc703

File tree

85 files changed

+2067
-1017
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+2067
-1017
lines changed

‎.github/pull_request_template.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Pull request
22

3-
Please ensure this PR targets the **`dev` branch** and follows the project conventions.
3+
Please ensure this PR targets the **`dev` branch** and follows the project conventions.
44
CI already runs linting, formatting, and build checks automatically.
55

66
---
@@ -33,16 +33,16 @@ Short description of what this PR changes or adds.
3333

3434
- [ ] Android
3535
- [ ] iOS
36-
- [ ] Core
36+
- [ ] JS
3737
- [ ] Example App
3838
- [ ] Docs
3939

4040
---
4141

4242
### Related
4343

44-
List any related issues, pull requests, or discussions.
45-
Use the format:
44+
List any related issues, pull requests, or discussions.
45+
Use the format:
4646
`Fixes #123`, `Refs #456`, `Close #789`
4747

4848
---

‎.github/workflows/prepare_dev_for_next_release.yml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: Prepare dev branch for next release
2+
3+
on:
4+
push:
5+
branches: [main]
6+
paths:
7+
- 'package.json'
8+
9+
permissions:
10+
contents: write
11+
12+
jobs:
13+
update-pods:
14+
name: Update Podfile.lock after release
15+
runs-on: macos-latest
16+
if: startsWith(github.event.head_commit.message, 'release:')
17+
env:
18+
XCODE_VERSION: latest-stable
19+
20+
steps:
21+
- name: Checkout
22+
uses: actions/[email protected]
23+
with:
24+
token: ${{ secrets.GITHUB_TOKEN }}
25+
fetch-depth: 0
26+
27+
- name: Setup
28+
uses: ./.github/actions/setup
29+
30+
- name: Install CocoaPods
31+
working-directory: example
32+
run: yarn ios:pods
33+
34+
- name: Commit updated Podfile.lock
35+
run: |
36+
git config user.name "github-actions[bot]"
37+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
38+
39+
git add example/ios/Podfile.lock
40+
41+
if git diff --cached --quiet; then
42+
echo "No Podfile.lock changes."
43+
exit 0
44+
fi
45+
46+
git commit -m "chore(example): update Podfile.lock after release [skip ci]"
47+
git push
48+
49+
sync-dev:
50+
name: Merge main into dev
51+
runs-on: ubuntu-latest
52+
needs: update-pods
53+
if: startsWith(github.event.head_commit.message, 'release:')
54+
steps:
55+
- name: Checkout
56+
uses: actions/[email protected]
57+
with:
58+
token: ${{ secrets.GITHUB_TOKEN }}
59+
fetch-depth: 0
60+
61+
- name: Fetch all branches
62+
run: git fetch --all
63+
64+
- name: Fast-forward dev with main
65+
run: |
66+
git checkout dev
67+
git merge origin/main --ff-only
68+
git push origin dev

‎.github/workflows/pull_request.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ jobs:
1313
steps:
1414
- name: Checkout
1515
uses: actions/[email protected]
16+
with:
17+
fetch-depth: 0
1618

1719
- name: Setup
1820
uses: ./.github/actions/setup
@@ -37,6 +39,8 @@ jobs:
3739
steps:
3840
- name: Checkout
3941
uses: actions/[email protected]
42+
with:
43+
fetch-depth: 0
4044

4145
- name: Setup
4246
uses: ./.github/actions/setup
@@ -50,6 +54,8 @@ jobs:
5054
steps:
5155
- name: Checkout
5256
uses: actions/[email protected]
57+
with:
58+
fetch-depth: 0
5359

5460
- name: Setup
5561
uses: ./.github/actions/setup
@@ -89,10 +95,12 @@ jobs:
8995
runs-on: macos-latest
9096
needs: [lint, test]
9197
env:
92-
XCODE_VERSION: latest-stable
98+
XCODE_VERSION: '26.0.1'
9399
steps:
94100
- name: Checkout
95101
uses: actions/[email protected]
102+
with:
103+
fetch-depth: 0
96104

97105
- name: Setup
98106
uses: ./.github/actions/setup
@@ -112,10 +120,5 @@ jobs:
112120
- name: Create Secrets.xcconfig
113121
run: echo MAPS_API_KEY="API_KEY" >> example/ios/Secrets.xcconfig
114122

115-
- name: Install iOS Simulator runtime
116-
run: |
117-
sudo xcodebuild -runFirstLaunch
118-
sudo xcodebuild -downloadPlatform iOS
119-
120123
- name: Build example for iOS
121124
run: yarn build:ios

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Checkout
2727
uses: actions/[email protected]
2828
with:
29-
fetch-depth: 0 # wichtig für semantic-release, damit alle Tags vorhanden sind
29+
fetch-depth: 0
3030

3131
- name: Setup
3232
uses: ./.github/actions/setup

‎.github/workflows/validate_pr_source.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Validate main branch PR source
2+
3+
on:
4+
pull_request_target:
5+
branches: [main]
6+
types: [opened, reopened, synchronize]
7+
8+
permissions:
9+
pull-requests: write
10+
contents: read
11+
12+
jobs:
13+
close:
14+
if: ${{ github.event.pull_request.head.ref != 'dev' }}
15+
runs-on: ubuntu-latest
16+
env:
17+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
18+
steps:
19+
- name: Close PR
20+
run: |
21+
echo "Closing PR from invalid source branch: ${{ github.event.pull_request.head.ref }}"
22+
23+
gh pr comment ${{ github.event.pull_request.number }} \
24+
--body "This PR targets **main**, but it was created from **${{ github.event.pull_request.head.ref }}**. Only PRs from **dev** are allowed."
25+
gh pr close ${{ github.event.pull_request.number }}

‎.prettierignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
CHANGELOG.md
2+
node_modules/
3+
lib/
4+
expoConfig/build/

‎.prettierrc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"quoteProps": "consistent",
3+
"singleQuote": true,
4+
"tabWidth": 2,
5+
"trailingComma": "es5",
6+
"useTabs": false
7+
}

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
[![Dev Release](https://img.shields.io/npm/v/react-native-google-maps-plus/dev.svg?label=dev%20release&color=orange)](https://www.npmjs.com/package/react-native-google-maps-plus)
55
[![Build](https://github.com/pinpong/react-native-google-maps-plus/actions/workflows/release.yml/badge.svg)](https://github.com/pinpong/react-native-google-maps-plus/actions/workflows/release.yml)
66
![React Native](https://img.shields.io/badge/react--native-%3E%3D0.81.0-61dafb.svg?logo=react)
7-
![Platform: Android](https://img.shields.io/badge/android-supported-brightgreen.svg?logo=android&logoColor=white)
8-
![Platform: iOS](https://img.shields.io/badge/ios-supported-lightgrey.svg?logo=apple&logoColor=black)
97

108
React Native wrapper for Android & iOS Google Maps SDK.
119

‎android/.editorconfig‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
insert_final_newline = true
7+
trim_trailing_whitespace = true
8+
9+
indent_style = space
10+
indent_size = 2
11+
12+
max_line_length = 150

‎android/build.gradle‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -70,27 +70,6 @@ android {
7070
}
7171
}
7272

73-
packagingOptions {
74-
excludes = [
75-
"META-INF",
76-
"META-INF/**",
77-
"**/libc++_shared.so",
78-
"**/libfbjni.so",
79-
"**/libjsi.so",
80-
"**/libfolly_json.so",
81-
"**/libfolly_runtime.so",
82-
"**/libglog.so",
83-
"**/libhermes.so",
84-
"**/libhermes-executor-debug.so",
85-
"**/libhermes_executor.so",
86-
"**/libreactnative.so",
87-
"**/libreactnativejni.so",
88-
"**/libturbomodulejsijni.so",
89-
"**/libreact_nativemodule_core.so",
90-
"**/libjscexecutor.so"
91-
]
92-
}
93-
9473
buildFeatures {
9574
buildConfig true
9675
prefab true

0 commit comments

Comments
 (0)