Skip to content

Commit 04d45f9

Browse files
authored
feat: support rn 0.76 (#5)
Update to support React Native 0.76
1 parent 8ecd7a5 commit 04d45f9

File tree

18 files changed

+28732
-2822
lines changed

18 files changed

+28732
-2822
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
blank_issues_enabled: false
22
contact_links:
33
- name: Feature Request 💡
4-
url: https://github.com/ieow/react-native-google-acm/discussions/new?category=ideas
4+
url: https://github.com/Metamask/react-native-acm/discussions/new?category=ideas
55
about: If you have a feature request, please create a new discussion on GitHub.
66
- name: Discussions on GitHub 💬
7-
url: https://github.com/ieow/react-native-google-acm/discussions
7+
url: https://github.com/Metamask/react-native-acm/discussions
88
about: If this library works as promised but you need help, please ask questions there.

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ The [example app](/example/) demonstrates usage of the library. You need to run
2323

2424
It is configured to use the local version of the library, so any changes you make to the library's source code will be reflected in the example app. Changes to the library's JavaScript code will be reflected in the example app without a rebuild, but native code changes will require a rebuild of the example app.
2525

26-
If you want to use Android Studio or XCode to edit the native code, you can open the `example/android` or `example/ios` directories respectively in those editors. To edit the Objective-C or Swift files, open `example/ios/GoogleAcmExample.xcworkspace` in XCode and find the source files at `Pods > Development Pods > react-native-google-acm`.
26+
If you want to use Android Studio or XCode to edit the native code, you can open the `example/android` or `example/ios` directories respectively in those editors. To edit the Objective-C or Swift files, open `example/ios/GoogleAcmExample.xcworkspace` in XCode and find the source files at `Pods > Development Pods > @metamask/react-native-acm`.
2727

28-
To edit the Java or Kotlin files, open `example/android` in Android studio and find the source files at `react-native-google-acm` under `Android`.
28+
To edit the Java or Kotlin files, open `example/android` in Android studio and find the source files at `@metamask/react-native-acm` under `Android`.
2929

3030
You can use various commands from the root directory to work with the project.
3131

GoogleAcm.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
1111
s.authors = package["author"]
1212

1313
s.platforms = { :ios => min_ios_version_supported }
14-
s.source = { :git => "https://github.com/ieow/react-native-google-acm.git", :tag => "#{s.version}" }
14+
s.source = { :git => "https://github.com/MetaMask/react-native-acm.git", :tag => "#{s.version}" }
1515

1616
s.source_files = "ios/**/*.{h,m,mm,swift}"
1717

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# react-native-google-acm
1+
# @metamask/react-native-acm
22

33
Google ACM for react-native
44

android/build.gradle

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@ def supportsNamespace() {
3333
return (major == 7 && minor >= 3) || major >= 8
3434
}
3535

36-
kotlin {
37-
jvmToolchain {
38-
languageVersion = JavaLanguageVersion.of(11)
39-
}
40-
}
41-
4236
android {
4337
if (supportsNamespace()) {
4438
namespace "com.googleacm"
@@ -68,8 +62,8 @@ android {
6862
}
6963

7064
compileOptions {
71-
sourceCompatibility JavaVersion.VERSION_1_1
72-
targetCompatibility JavaVersion.VERSION_1_1
65+
sourceCompatibility JavaVersion.VERSION_1_8
66+
targetCompatibility JavaVersion.VERSION_1_8
7367
}
7468
}
7569

@@ -84,9 +78,9 @@ dependencies {
8478
implementation "com.facebook.react:react-android"
8579
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
8680

87-
implementation "androidx.credentials:credentials:1.2.0"
88-
implementation "androidx.credentials:credentials-play-services-auth:1.2.0"
89-
implementation "com.google.android.libraries.identity.googleid:googleid:1.0.1"
81+
implementation "androidx.credentials:credentials:1.5.0"
82+
implementation "androidx.credentials:credentials-play-services-auth:1.5.0"
83+
implementation "com.google.android.libraries.identity.googleid:googleid:1.1.1"
9084
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
9185
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
9286
}

android/src/main/java/com/googleacm/GoogleAcmModule.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ class GoogleAcmModule(reactContext: ReactApplicationContext) :
7070
val nonce = requestObject.getString("nonce") ?: ""
7171
val serverClientId = requestObject.getString("serverClientId") ?: ""
7272
val autoSelectEnabled = requestObject.getBoolean("autoSelectEnabled") ?: false
73-
// val filterByAuthorizedAccounts = requestObject.getBoolean("filterByAuthorizedAccounts") ?: false
73+
val filterByAuthorizedAccounts = requestObject.getBoolean("filterByAuthorizedAccounts") ?: false
7474

7575
val googleIdOption = GetGoogleIdOption
7676
.Builder()
77-
.setFilterByAuthorizedAccounts(false)
77+
.setFilterByAuthorizedAccounts(filterByAuthorizedAccounts)
7878
.setServerClientId(serverClientId)
7979
.setAutoSelectEnabled(autoSelectEnabled)
8080
.setNonce(nonce)

example/ios/Podfile.lock

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1556,7 +1556,7 @@ DEPENDENCIES:
15561556
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
15571557
- fmt (from `../node_modules/react-native/third-party-podspecs/fmt.podspec`)
15581558
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
1559-
- GoogleAcm (from `../..`)
1559+
- GoogleAcm (from `../node_modules/@metamask/react-native-acm`)
15601560
- hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
15611561
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
15621562
- RCT-Folly/Fabric (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
@@ -1638,7 +1638,7 @@ EXTERNAL SOURCES:
16381638
glog:
16391639
:podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
16401640
GoogleAcm:
1641-
:path: "../.."
1641+
:path: "../node_modules/@metamask/react-native-acm"
16421642
hermes-engine:
16431643
:podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec"
16441644
:tag: hermes-2025-01-13-RNv0.78.0-a942ef374897d85da38e9c8904574f8376555388
@@ -1768,69 +1768,69 @@ SPEC CHECKSUMS:
17681768
FBLazyVector: e32d34492c519a2194ec9d7f5e7a79d11b73f91c
17691769
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
17701770
glog: eb93e2f488219332457c3c4eafd2738ddc7e80b8
1771-
GoogleAcm: a007eafe954093a66f8c72e2cc03ac0d033b0706
1771+
GoogleAcm: 6800eea1922bc30585892a2ec2a665823c680638
17721772
hermes-engine: 2771b98fb813fdc6f92edd7c9c0035ecabf9fee7
1773-
RCT-Folly: 36fe2295e44b10d831836cc0d1daec5f8abcf809
1773+
RCT-Folly: e78785aa9ba2ed998ea4151e314036f6c49e6d82
17741774
RCTDeprecation: be794de7dc6ed8f9f7fbf525f86e7651b8b68746
17751775
RCTRequired: a83787b092ec554c2eb6019ff3f5b8d125472b3b
17761776
RCTTypeSafety: 48ad3c858926b1c46f46a81a58822b476e178e2c
17771777
React: 3b5754191f1b65f1dbc52fbea7959c3d2d9e39c9
17781778
React-callinvoker: 6beeaf4c7db11b6cc953fac45f2c76e3fb125013
1779-
React-Core: 88e817c42de035378cc71e009193b9a044d3f595
1780-
React-CoreModules: dcf764d71efb4f75d38fcae8d4513b6729f49360
1781-
React-cxxreact: 8cdcc937c5fbc406fe843a381102fd69440ca78a
1779+
React-Core: 8a10ac9de53373a3ecb5dfcbcf56df1d3dad0861
1780+
React-CoreModules: af6999b35c7c01b0e12b59d27f3e054e13da43b1
1781+
React-cxxreact: 833f00155ce8c2fda17f6d286f8eaeff2ececc69
17821782
React-debug: 440175830c448e7e53e61ebb8d8468c3256b645e
1783-
React-defaultsnativemodule: 4824bcd7b96ee2d75c28b1ca21f58976867f5535
1784-
React-domnativemodule: a421118b475618961cf282e8ea85347cc9bb453c
1785-
React-Fabric: 6ac7de06009eb96b609a770b17abba6e460b5f45
1786-
React-FabricComponents: e3bc2680a5a9a4917ff0c8d7f390688c30ef753c
1787-
React-FabricImage: 8bad558dec7478077974caa96acc79692d6b71f5
1783+
React-defaultsnativemodule: a970effe18fe50bdbbb7115c3297f873b666d0d4
1784+
React-domnativemodule: 45f886342a724e61531b18fba1859bb6782e5d62
1785+
React-Fabric: 69f1881f2177a8512304a64157943548ab6df0cf
1786+
React-FabricComponents: f54111c8e2439fc273ab07483e3a7054ca1e75af
1787+
React-FabricImage: 9ad2619dfe8c386d79e8aaa87da6e8f018ab9592
17881788
React-featureflags: b9cf9b35baca1c7f20c06a104ffc325a02752faa
1789-
React-featureflagsnativemodule: dc93d81da9f41f7132e24455ec8b4b60802fd5b0
1790-
React-graphics: aaa5a38bea15d7b895b210d95d554af45a07002a
1791-
React-hermes: 08ad9fb832d1b9faef391be17309aa6a69fad23b
1792-
React-idlecallbacksnativemodule: aacea33ef6c511a9781f9286cc7cdf93f39bba14
1793-
React-ImageManager: c596c3b658c9c14607f9183ed0f635c8dd77987c
1794-
React-jserrorhandler: 987609b2f16b7d79d63fcd621bf0110dd7400b35
1795-
React-jsi: afa286d7e0c102c2478dc420d4f8935e13c973fc
1796-
React-jsiexecutor: 08f5b512b4db9e2f147416d60a0a797576b9cfef
1797-
React-jsinspector: 5a94bcae66e3637711c4d96a00038ab9ec935bf5
1798-
React-jsinspectortracing: a12589a0adbb2703cbc4380dabe9a58800810923
1799-
React-jsitracing: 0b1a403d7757cec66b7dd8b308d04db85eef75f3
1800-
React-logger: 304814ae37503c8eb54359851cc55bd4f936b39c
1801-
React-Mapbuffer: b588d1ca18d2ce626f868f04ab12d8b1f004f12c
1802-
React-microtasksnativemodule: 11831d070aa47755bb5739069eb04ec621fec548
1803-
React-NativeModulesApple: 79a4404ac301b40bec3b367879c5e9a9ce81683c
1804-
React-perflogger: 0ea25c109dba33d47dec36b2634bf7ea67c1a555
1805-
React-performancetimeline: f74480de6efbcd8541c34317c0baedb433f27296
1789+
React-featureflagsnativemodule: 7f1bc76d1d2c5bede5e753b8d188dbde7c59b12f
1790+
React-graphics: 069e0d0b31ed1e80feb023ad4f7e97f00e84f7b9
1791+
React-hermes: 63df5ac5a944889c8758a6213b39ed825863adb7
1792+
React-idlecallbacksnativemodule: 4c700bd7c0012adf904929075a79418b828b5ffc
1793+
React-ImageManager: 5d1ba8a7bae44ebba43fc93da64937c713d42941
1794+
React-jserrorhandler: 0defd58f8bb797cdd0a820f733bf42d8bee708ce
1795+
React-jsi: 99d6207ec802ad73473a0dad3c9ad48cd98463f6
1796+
React-jsiexecutor: 8c8097b4ba7e7f480582d6e6238b01be5dcc01c0
1797+
React-jsinspector: ea148ec45bc7ff830e443383ea715f9780c15934
1798+
React-jsinspectortracing: 46bb2841982f01e7b63eaab98140fa1de5b2a1db
1799+
React-jsitracing: c1063fc2233960d1c8322291e74bca51d25c10d7
1800+
React-logger: 763728cf4eebc9c5dc9bfc3649e22295784f69f3
1801+
React-Mapbuffer: 63278529b5cf531a7eaf8fc71244fabb062ca90c
1802+
React-microtasksnativemodule: 6a39463c32ce831c4c2aa8469273114d894b6be9
1803+
React-NativeModulesApple: fd0545efbb7f936f78edd15a6564a72d2c34bb32
1804+
React-perflogger: 5f8fa36a8e168fb355efe72099efe77213bc2ac6
1805+
React-performancetimeline: 8c0ecfa1ae459cc5678a65f95ac3bf85644d6feb
18061806
React-RCTActionSheet: 2ef95837e89b9b154f13cd8401f9054fc3076aff
1807-
React-RCTAnimation: 33d960d7f58a81779eea6dea47ad0364c67e1517
1808-
React-RCTAppDelegate: d9a3d89b3dd9bcfed7d7c55b0b7e48a97e5cb31e
1809-
React-RCTBlob: 74c986a02d951931d2f6ed0e07ed5a7eb385bfc0
1810-
React-RCTFabric: bf6790a26671e95d9fd680000db641488fc0d0d4
1811-
React-RCTFBReactNativeSpec: 5fe1cdf377ffb52bb3833e9f8f5cc03765b6a22e
1812-
React-RCTImage: 2c58b5ddeb3c65e52f942bbe13ff9c59bd649b09
1813-
React-RCTLinking: b6b14f8a3e62c02fc627ac4f3fb0c7bd941f907c
1814-
React-RCTNetwork: 1d050f2466c1541b339587d46f78d5eee218d626
1815-
React-RCTSettings: 8148f6be0ccc0cfe6e313417ebf8a479caaa2146
1816-
React-RCTText: 64114531ad1359e4e02a4a8af60df606dbbabc25
1817-
React-RCTVibration: f4859417a7dd859b6bf18b1aba897e52beb72ef6
1807+
React-RCTAnimation: 46abefd5acfda7e6629f9e153646deecc70babd2
1808+
React-RCTAppDelegate: 7e58e0299e304cceee3f7019fa77bc6990f66b22
1809+
React-RCTBlob: f68c63a801ef1d27e83c4011e3b083cc86a200d7
1810+
React-RCTFabric: c59f41d0c4edbaac8baa232731ca09925ae4dda7
1811+
React-RCTFBReactNativeSpec: 3240b9b8d792aa4be0fb85c9898fc183125ba8de
1812+
React-RCTImage: 34e0bba1507e55f1c614bd759eb91d9be48c8c5b
1813+
React-RCTLinking: a0b6c9f4871c18b0b81ea952f43e752718bd5f1d
1814+
React-RCTNetwork: bdafd661ac2b20d23b779e45bf7ac3e4c8bd1b60
1815+
React-RCTSettings: 98aa5163796f43789314787b584a84eba47787a9
1816+
React-RCTText: 424a274fc9015b29de89cf3cbcdf4dd85dd69f83
1817+
React-RCTVibration: 92d9875a955b0adb34b4b773528fdbbbc5addd6c
18181818
React-rendererconsistency: 5ac4164ec18cfdd76ed5f864dbfdc56a5a948bc9
1819-
React-rendererdebug: 3dc1d97bbee0c0c13191e501a96ed9325bbd920e
1819+
React-rendererdebug: 710dbd7990e355852c786aa6bc7753f6028f357a
18201820
React-rncore: 0bace3b991d8843bb5b57c5f2301ec6e9c94718b
1821-
React-RuntimeApple: 1e1e0a0c6086bc8c3b07e8f1a2f6ca99b50419a0
1822-
React-RuntimeCore: d39322c59bef2a4b343fda663d20649f29f57fcc
1821+
React-RuntimeApple: 701ec44a8b5d863ee9b6a2b2447b6a26bb6805a1
1822+
React-RuntimeCore: a82767065b9a936b05e209dc6987bc1ea9eb5d2d
18231823
React-runtimeexecutor: 876dfc1d8daa819dfd039c40f78f277c5a3e66a6
1824-
React-RuntimeHermes: 44f5f2baf039f249b31ea4f3e224484fd1731e0e
1825-
React-runtimescheduler: 3b3c5b50743bb8743ca49b9e5a70c2c385f156e1
1824+
React-RuntimeHermes: e7a051fd91cab8849df56ac917022ef6064ad621
1825+
React-runtimescheduler: c544141f2124ee3d5f3d5bf0d69f4029a61a68b0
18261826
React-timing: 1ee3572c398f5579c9df5bf76aacddf5683ff74e
1827-
React-utils: 0cfb7c7fb37d4e5f31cc18ffc7426be0ae6bf907
1828-
ReactAppDependencyProvider: b48473fe434569ff8f6cb6ed4421217ebcbda878
1829-
ReactCodegen: 78b64f0ad96ef733616f54d0c20923f6c67287fd
1830-
ReactCommon: 547db015202a80a5b3e7e041586ea54c4a087180
1827+
React-utils: 18703928768cb37e70cf2efff09def12d74a399e
1828+
ReactAppDependencyProvider: 4893bde33952f997a323eb1a1ee87a72764018ff
1829+
ReactCodegen: 99ea3536c05be3c18d0c517acb56b5a6d726fc7b
1830+
ReactCommon: 865ebe76504a95e115b6229dd00a31e56d2d4bfe
18311831
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
1832-
Yoga: 66a9a23a82dd4081b393babe509967097759b3d6
1832+
Yoga: e14bad835e12b6c7e2260fc320bd00e0f4b45add
18331833

18341834
PODFILE CHECKSUM: 156d47fb2b5b2c14bab4d09166adb4b87340ef29
18351835

1836-
COCOAPODS: 1.15.2
1836+
COCOAPODS: 1.16.2

0 commit comments

Comments
 (0)