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
1 change: 1 addition & 0 deletions .github/actions/build-android/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ runs:
echo -e "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8" >> ./gradle.properties
echo -e "android.useAndroidX=true" >> ./gradle.properties
echo -e "android.enableJetifier=true" >> ./gradle.properties
echo -e "android.jetifier.ignorelist=bcprov-jdk18on" >> ./gradle.properties
echo -e "reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64" >> ./gradle.properties
echo -e "newArchEnabled=true" >> ./gradle.properties
echo -e "hermesEnabled=true" >> ./gradle.properties
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/e2e-build-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ jobs:
echo -e "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8" >> ./gradle.properties
echo -e "android.useAndroidX=true" >> ./gradle.properties
echo -e "android.enableJetifier=true" >> ./gradle.properties
echo -e "android.jetifier.ignorelist=bcprov-jdk18on" >> ./gradle.properties
echo -e "reactNativeArchitectures=arm64-v8a,x86_64" >> ./gradle.properties
echo -e "APPLICATION_ID=chat.rocket.android" >> ./gradle.properties
echo -e "newArchEnabled=true" >> ./gradle.properties
Expand Down
8 changes: 8 additions & 0 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,14 @@ android {
manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]
}

packaging {
resources {
// bcprov-jdk18on and its transitive jspecify both ship this OSGi bundle
// manifest inside their multi-release jars; it is unused on Android.
excludes += ["META-INF/versions/9/OSGI-INF/MANIFEST.MF"]
}
}

signingConfigs {
release {
v1SigningEnabled false
Expand Down
3 changes: 3 additions & 0 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
# Skip Jetifier for BouncyCastle: it is AndroidX-clean and ships Java 25 multi-release
# classes that Jetifier's bundled ASM cannot parse (unsupported class file major version 69)
android.jetifier.ignorelist=bcprov-jdk18on

# Use this property to specify which architecture you want to build.
# You can also override it from the CLI using
Expand Down
6 changes: 3 additions & 3 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ PODS:
- MMKV (2.2.4):
- MMKVCore (~> 2.2.4)
- MMKVCore (2.2.4)
- MobileCrypto (0.3.0):
- MobileCrypto (0.4.0):
- boost
- DoubleConversion
- fast_float
Expand Down Expand Up @@ -4023,7 +4023,7 @@ SPEC CHECKSUMS:
libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
MMKV: 1a8e7dbce7f9cad02c52e1b1091d07bd843aefaf
MMKVCore: f2dd4c9befea04277a55e84e7812f930537993df
MobileCrypto: 382f541e04405f45c323b11a404d3cc4546d0669
MobileCrypto: cbe4be11a33b5888e77861de9346fa5d3fccc8ac
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
NitroMmkv: 4a2d747ce97a4ae740b3cb3a3853366813faf831
NitroModules: 18e41c298d86fc753fc754969fa9f84044e70711
Expand Down Expand Up @@ -4136,6 +4136,6 @@ SPEC CHECKSUMS:
Yoga: 1e91d83a5286cfd3b725eade59274c92270540d4
ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5

PODFILE CHECKSUM: 4a928f36cea73defa438bb62e3a52a85a0b5f71a
PODFILE CHECKSUM: 9ef0d302aac0150cec49089c7c416db32bb9d3ec

COCOAPODS: 1.15.2
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading