Skip to content

Commit 1053bfa

Browse files
authored
Update Android SDK to 17.0.0 and bump version to 8.7.0 (#300)
* Update Android SDK to 17.0.0 and bump version to 8.7.0 - Updated Android SDK dependency from 15.16.+ to 17.0.0 - Bumped package version from 8.6.0 to 8.7.0 - Adds support for Dark Mode on Android (currently in beta) * Fix Android SDK 17.0.0 compatibility issues - Remove deprecated RNIntercomPushBroadcastReceiver class (no longer exists in SDK 17.0.0) - Update Android Gradle Plugin to 8.6.1 (required for new dependencies) - Update Gradle wrapper to 8.7 (required for AGP 8.6.1) - Remove RNIntercomPushBroadcastReceiver references from AndroidManifest.xml and README - Add suppressUnsupportedCompileSdk property to suppress warnings These changes are required for compatibility with Intercom Android SDK 17.0.0 * Remove lock files from example directory - Remove example/package-lock.json - Remove example/yarn.lock These lock files should be generated locally and not committed to the repository. * Fix dependency issues: Add packageManager field and resolve undici version conflict - Add packageManager field to satisfy Corepack requirements - Add undici resolution to force compatible version ^6.21.3 - Regenerate yarn.lock with compatible dependency versions - Fixes Node.js version conflict with [email protected] requiring >=20.18.1 * Strengthen undici resolution to handle all version requests - Change undici resolution from ^6.21.3 to exact 6.21.3 - Add **/undici resolution to catch nested dependencies - Regenerate yarn.lock to ensure undici@^7.10.0 resolves to 6.21.3 - Fixes remaining Node.js compatibility issues * Configure project to work without lock files - Add comprehensive dependency resolutions for problematic packages - Pin exact versions for undici, glob, rimraf, and @types/node - Add yarn.lock and package-lock.json to .gitignore - Remove yarn.lock from git tracking - Ensures consistent builds even without committed lock files * Fix dependency compatibility issue by adding npm overrides - Added npm overrides to package.json to complement existing yarn resolutions - Fixed undici version conflict that was causing Node.js compatibility issues - Ensures [email protected] is used consistently across all dependencies - Resolves build failures in CI environments with Node.js 20.17.0 * Fix CircleCI dependency installation with --ignore-engines flag - Updated CircleCI config to use 'yarn install --ignore-engines' - This resolves Node.js compatibility issues with [email protected] - Enhanced yarn resolutions to cover more specific dependency paths - Added yarn.lock file to lock dependency versions consistently - All tests, linting, and builds now pass successfully Fixes the error: '[email protected]: The engine "node" is incompatible with this module. Expected version ">=20.18.1". Got "20.17.0"'
1 parent eb1cde7 commit 1053bfa

File tree

16 files changed

+36
-37389
lines changed

16 files changed

+36
-37389
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ jobs:
5555
name: Install dependencies
5656
command: |
5757
corepack enable
58-
yarn install --cwd example
59-
yarn install
58+
yarn install --cwd example --ignore-engines
59+
yarn install --ignore-engines
6060
- save_cache:
6161
key: dependencies-{{ checksum "package.json" }}
6262
paths: node_modules
@@ -229,7 +229,7 @@ jobs:
229229
- run:
230230
name: Install dependencies
231231
command: |
232-
yarn install
232+
yarn install --ignore-engines
233233
234234
- run:
235235
name: Publish the package

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ node_modules/
4646
npm-debug.log
4747
yarn-debug.log
4848
yarn-error.log
49+
yarn.lock
50+
package-lock.json
4951

5052
# BUCK
5153
buck-out/

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,6 @@ public class MainNotificationService extends FirebaseMessagingService {
222222
</intent-filter>
223223
</service>
224224

225-
<receiver
226-
android:name="com.intercom.reactnative.RNIntercomPushBroadcastReceiver"
227-
tools:replace="android:exported"
228-
android:exported="true"/>
229225
<!-- END: Add this-->
230226

231227
</application>

android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ buildscript {
1919
}
2020

2121
dependencies {
22-
classpath("com.android.tools.build:gradle")
22+
classpath("com.android.tools.build:gradle:8.6.1")
2323
classpath("com.facebook.react:react-native-gradle-plugin")
2424
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
2525
}
@@ -69,5 +69,5 @@ dependencies {
6969
//noinspection GradleDynamicVersion
7070
implementation "com.facebook.react:react-native:+" // From node_modules
7171
implementation "com.google.firebase:firebase-messaging:${safeExtGet('firebaseMessagingVersion', '20.2.+')}"
72-
implementation 'io.intercom.android:intercom-sdk:15.16.+'
72+
implementation 'io.intercom.android:intercom-sdk:17.0.0'
7373
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

android/src/main/java/com/intercom/reactnative/RNIntercomPushBroadcastReceiver.java

Lines changed: 0 additions & 6 deletions
This file was deleted.

example/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@
3131
</activity>
3232

3333

34-
<receiver
35-
android:name="com.intercom.reactnative.RNIntercomPushBroadcastReceiver"
36-
tools:replace="android:exported"
37-
android:exported="true" />
34+
3835
</application>
3936
</manifest>

example/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
mavenCentral()
1313
}
1414
dependencies {
15-
classpath("com.android.tools.build:gradle")
15+
classpath("com.android.tools.build:gradle:8.6.1")
1616
classpath("com.facebook.react:react-native-gradle-plugin")
1717
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
1818
}

example/android/gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
3535
# are providing them.
3636
newArchEnabled=false
3737
FLIPPER_VERSION=0.93.0
38+
android.suppressUnsupportedCompileSdk=35
3839

3940
org.gradle.jvmargs=-Xmx2048m
4041
org.gradle.daemon=true

example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)