Skip to content

Commit c5870f0

Browse files
clauxxclauxx
authored
Merge branch 'develop' into cl-19226-remove-not-implemented-box
2 parents 5ff151f + 418053b commit c5870f0

File tree

144 files changed

+6870
-3135
lines changed

Some content is hidden

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

144 files changed

+6870
-3135
lines changed

Diff for: ‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.25.0
1+
2.27.0

Diff for: ‎android/app/build.gradle

+9-7
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,16 @@ def getEnvOrConfig = { varName ->
138138
android {
139139
ndkVersion rootProject.ext.ndkVersion
140140

141-
compileSdkVersion rootProject.ext.compileSdkVersion
141+
buildToolsVersion rootProject.ext.buildToolsVersion
142+
compileSdk rootProject.ext.compileSdkVersion
143+
144+
kotlinOptions {
145+
jvmTarget = JavaVersion.VERSION_17
146+
}
142147

143148
compileOptions {
144-
sourceCompatibility JavaVersion.VERSION_11
145-
targetCompatibility JavaVersion.VERSION_11
149+
sourceCompatibility JavaVersion.VERSION_17
150+
targetCompatibility JavaVersion.VERSION_17
146151
}
147152

148153
namespace "im.status.ethereum"
@@ -194,10 +199,6 @@ android {
194199
doNotStrip '*/mips/*.so'
195200
doNotStrip '*/mips64/*.so'
196201
}
197-
dexOptions {
198-
jumboMode true
199-
javaMaxHeapSize "8g"
200-
}
201202
splits {
202203
abi {
203204
reset()
@@ -286,6 +287,7 @@ dependencies {
286287
implementation("com.facebook.fresco:animated-gif:2.5.0")
287288
implementation("com.squareup.okhttp3:okhttp-tls:4.9.2")
288289
implementation("com.google.prefab:cli:2.0.0")
290+
implementation("com.android.tools.build:aapt2:8.1.1-10154469")
289291
}
290292

291293

Diff for: ‎android/app/src/debug/AndroidManifest.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,5 @@
77
<!-- Remove licensing permission since we don't license our app and it blocks F-Droid submissions. -->
88
<uses-permission tools:node="remove" android:name="com.android.vending.CHECK_LICENSE"/>
99

10-
<application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:usesCleartextTraffic="true" >
11-
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
12-
</application>
10+
<application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:usesCleartextTraffic="true" />
1311
</manifest>

Diff for: ‎android/app/src/main/AndroidManifest.xml

+8-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
<!-- non-dangerous permissions -->
66
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
7+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
78
<uses-permission android:name="android.permission.INTERNET"/>
89
<uses-permission android:name="android.permission.NFC"/>
910
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -74,7 +75,13 @@
7475
</intent-filter>
7576
</activity>
7677
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity"/>
77-
<service android:name="im.status.ethereum.pushnotifications.ForegroundService"></service>
78+
<service
79+
android:name="im.status.ethereum.pushnotifications.ForegroundService"
80+
android:foregroundServiceType="specialUse">
81+
<property
82+
android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
83+
android:value="local notifications"/>
84+
</service>
7885
<provider
7986
android:name="androidx.core.content.FileProvider"
8087
android:authorities="${applicationId}.provider"

Diff for: ‎android/app/src/main/java/im/status/ethereum/MainActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class MainActivity : NavigationActivity(), ActivityCompat.OnRequestPermissionsRe
9999

100100
private fun tryToEmit(eventName: String, event: WritableMap) {
101101
try {
102-
(getApplication() as MainApplication).getReactNativeHost()
102+
(getApplication() as MainApplication).reactNativeHost
103103
.getReactInstanceManager()
104104
.getCurrentReactContext()
105105
?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)

Diff for: ‎android/app/src/main/java/im/status/ethereum/MainApplication.kt

+9-11
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@ class MainApplication : NavigationApplication() {
2525
return BuildConfig.DEBUG
2626
}
2727

28-
override fun getPackages(): List<ReactPackage> {
29-
val statusPackage = StatusPackage(RootUtil.isDeviceRooted())
30-
val packages = PackageList(this).getPackages()
31-
packages.add(statusPackage)
32-
packages.add(RNStatusKeycardPackage())
33-
packages.add(PushNotificationPackage())
34-
packages.add(BlurViewPackage())
35-
return packages
28+
override fun getPackages(): List<ReactPackage> =
29+
PackageList(this).packages.apply {
30+
// Packages that cannot be autolinked yet can be added manually here
31+
add(StatusPackage(RootUtil.isDeviceRooted()))
32+
add(RNStatusKeycardPackage())
33+
add(PushNotificationPackage())
34+
add(BlurViewPackage())
3635
}
3736

3837
override fun getJSMainModuleName(): String = "index"
@@ -42,9 +41,8 @@ class MainApplication : NavigationApplication() {
4241
override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
4342
}
4443

45-
override fun getReactNativeHost(): ReactNativeHost {
46-
return mReactNativeHost
47-
}
44+
override val reactNativeHost: ReactNativeHost
45+
get() = mReactNativeHost
4846

4947
override fun onCreate() {
5048
super.onCreate()

Diff for: ‎android/build.gradle

+22
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ ext {
1515
supportLibVersion = project.supportLibVersion
1616
gradlePluginVersion = project.gradlePluginVersion
1717
kotlinVersion = project.kotlinPluginVersion
18+
kotlinPluginVersion = project.kotlinPluginVersion
19+
kotlinToolsVersion = project.kotlinPluginVersion
1820
ndkVersion = "25.2.9519653"
1921
}
2022

@@ -28,6 +30,7 @@ buildscript {
2830
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${project.ext.kotlinPluginVersion}"
2931
classpath("com.android.tools.build:gradle")
3032
classpath("com.facebook.react:react-native-gradle-plugin")
33+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
3134
}
3235
}
3336

@@ -41,11 +44,30 @@ subprojects {
4144
defaultConfig {
4245
targetSdkVersion rootProject.ext.targetSdkVersion
4346
}
47+
48+
// Speed up Tests Stage
49+
tasks.withType(Test).configureEach {
50+
// https://docs.gradle.org/current/userguide/performance.html#execute_tests_in_parallel
51+
maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
52+
// https://docs.gradle.org/current/userguide/performance.html#fork_tests_into_multiple_processes
53+
forkEvery = 100
54+
// https://docs.gradle.org/current/userguide/performance.html#disable_reports
55+
reports.html.required = false
56+
reports.junitXml.required = false
57+
}
58+
// Speed up Java Compile Stage
59+
// https://docs.gradle.org/current/userguide/performance.html#run_the_compiler_as_a_separate_process
60+
tasks.withType(JavaCompile).configureEach {
61+
options.fork = true
62+
}
63+
4464
}
4565
}
4666
}
4767
}
4868

69+
apply plugin: "com.facebook.react.rootproject"
70+
4971
allprojects {
5072
beforeEvaluate {
5173
if (System.env.STATUS_GO_ANDROID_LIBDIR == null || System.env.STATUS_GO_ANDROID_LIBDIR == "") {

Diff for: ‎android/gradle.properties

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
# Version requirements used throughout the Gradle scripts
2424
minSdkVersion=24
25-
compileSdkVersion=33
26-
targetSdkVersion=33
27-
buildToolsVersion=33.0.0
25+
compileSdkVersion=34
26+
targetSdkVersion=34
27+
buildToolsVersion=34.0.0
2828
supportLibVersion=28.0.0
2929
# This should match version from nix/pkgs/aapt2/default.nix
3030
gradlePluginVersion=7.4.2
@@ -43,7 +43,7 @@ ANDROID_ABI_SPLIT=false
4343
# Some platforms are excluded though
4444
ANDROID_ABI_INCLUDE=armeabi-v7a;arm64-v8a;x86;x86_64
4545

46-
org.gradle.jvmargs=-Xmx8704M
46+
org.gradle.jvmargs=-Xmx8704M -XX:+UseParallelGC
4747

4848
versionCode=9999
4949
commitHash=unknown

Diff for: ‎babel.config.js

+1-16
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,4 @@
11
module.exports = {
2-
presets: ['module:metro-react-native-babel-preset'],
2+
presets: ['module:@react-native/babel-preset'],
33
plugins: ['react-native-reanimated/plugin', '@babel/plugin-transform-named-capturing-groups-regex'],
4-
env: {
5-
test: {
6-
presets: [
7-
'@babel/preset-react',
8-
[
9-
'@babel/preset-env',
10-
{
11-
targets: {
12-
node: 'current',
13-
},
14-
},
15-
],
16-
],
17-
},
18-
},
194
};

Diff for: ‎ci/Jenkinsfile.e2e-nightly

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ pipeline {
55
agent { label 'linux' }
66

77
triggers {
8-
// Nightly at 2am
9-
cron 'H 2 * * *'
8+
// Nightly at 0am
9+
cron 'H 0 * * *'
1010
}
1111

1212
parameters {

Diff for: ‎fastlane/Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
source 'https://rubygems.org'
22

3+
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
34
gem 'fastlane', '>= 2.131.0'

0 commit comments

Comments
 (0)