Skip to content

Commit 2964ac4

Browse files
Merge branch 'feat/google-signin-account-filtering'
2 parents 060b11a + 0b67e23 commit 2964ac4

4 files changed

Lines changed: 300 additions & 113 deletions

File tree

.github/workflows/ci.yml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@ jobs:
102102
103103
- name: Build example for Android
104104
env:
105-
JAVA_OPTS: "-XX:MaxHeapSize=6g"
105+
JAVA_OPTS: '-XX:MaxHeapSize=6g'
106106
run: |
107107
yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}"
108108
109109
build-ios:
110-
runs-on: macos-latest
110+
runs-on: macos-14
111111
env:
112112
TURBO_CACHE_DIR: .turbo/ios
113113
steps:
@@ -117,6 +117,22 @@ jobs:
117117
- name: Setup
118118
uses: ./.github/actions/setup
119119

120+
- name: Setup Ruby
121+
uses: ruby/setup-ruby@v1
122+
with:
123+
ruby-version: '3.2'
124+
bundler-cache: true
125+
working-directory: example
126+
127+
- name: Select Xcode version
128+
run: sudo xcode-select -s /Applications/Xcode_15.4.app
129+
130+
- name: Show build environment
131+
run: |
132+
xcodebuild -version
133+
xcode-select -p
134+
clang --version
135+
120136
- name: Cache turborepo for iOS
121137
uses: actions/cache@v4
122138
with:
@@ -140,7 +156,7 @@ jobs:
140156
with:
141157
path: |
142158
**/ios/Pods
143-
key: ${{ runner.os }}-cocoapods-${{ hashFiles('example/ios/Podfile.lock') }}
159+
key: ${{ runner.os }}-cocoapods-${{ hashFiles('example/ios/Podfile.lock', 'example/ios/Podfile') }}
144160
restore-keys: |
145161
${{ runner.os }}-cocoapods-
146162
@@ -160,6 +176,11 @@ jobs:
160176
**/ios/Pods
161177
key: ${{ steps.cocoapods-cache.outputs.cache-key }}
162178

179+
- name: Clean iOS build folder
180+
if: env.turbo_cache_hit != 1
181+
run: |
182+
rm -rf example/ios/build
183+
163184
- name: Build example for iOS
164185
run: |
165186
yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}"

app.plugin.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
// set Info.plist values
22
import configPlugin from '@expo/config-plugins';
33

4-
const {createRunOncePlugin, withEntitlementsPlist, withInfoPlist} = configPlugin
4+
const { createRunOncePlugin, withEntitlementsPlist, withInfoPlist } =
5+
configPlugin;
56

67
const withAllowMixedLocalizations = function (config) {
7-
return withInfoPlist(config, function (config) {
8-
config.modResults.CFBundleAllowMixedLocalizations =
9-
config.modResults.CFBundleAllowMixedLocalizations ?? true;
8+
return withInfoPlist(config, function (modConfig) {
9+
modConfig.modResults.CFBundleAllowMixedLocalizations =
10+
modConfig.modResults.CFBundleAllowMixedLocalizations ?? true;
1011

11-
return config;
12+
return modConfig;
1213
});
1314
};
1415

1516
const withDefaultAppleSignIn = function (config) {
1617
config = withAllowMixedLocalizations(config);
17-
return withEntitlementsPlist(config, function (config) {
18-
config.modResults['com.apple.developer.applesignin'] = ['Default'];
19-
return config;
18+
return withEntitlementsPlist(config, function (modConfig) {
19+
modConfig.modResults['com.apple.developer.applesignin'] = ['Default'];
20+
return modConfig;
2021
});
2122
};
2223

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-credentials-manager",
3-
"version": "0.7.0",
3+
"version": "0.8.0",
44
"description": "A React Native library that implements the Credential Manager API for Android. This library allows you to manage passwords and passkeys in your React Native applications.",
55
"source": "./src/index.tsx",
66
"main": "./lib/commonjs/index.js",

0 commit comments

Comments
 (0)