Skip to content

Commit 36894cc

Browse files
committed
update android
1 parent eeb301a commit 36894cc

File tree

13 files changed

+1811
-3134
lines changed

13 files changed

+1811
-3134
lines changed

apps/tlon-mobile/android/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ build/
1010
local.properties
1111
*.iml
1212
*.hprof
13+
.cxx/
1314

1415
# Bundle artifacts
1516
*.jsbundle

apps/tlon-mobile/android/app/build.gradle

+3-4
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ android {
8989
compileSdk rootProject.ext.compileSdkVersion
9090
versionCode 108
9191
versionName "5.3.1"
92-
93-
buildConfigField("boolean", "REACT_NATIVE_UNSTABLE_USE_RUNTIME_SCHEDULER_ALWAYS", (findProperty("reactNative.unstable_useRuntimeSchedulerAlways") ?: true).toString())
9492
}
9593
signingConfigs {
9694
debug {
@@ -111,6 +109,7 @@ android {
111109
shrinkResources (findProperty('android.enableShrinkResourcesInReleaseBuilds')?.toBoolean() ?: false)
112110
minifyEnabled enableProguardInReleaseBuilds
113111
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
112+
crunchPngs (findProperty('android.enablePngCrunchInReleaseBuilds')?.toBoolean() ?: true)
114113
}
115114
}
116115
packagingOptions {
@@ -173,8 +172,6 @@ dependencies {
173172
}
174173
}
175174

176-
implementation("com.facebook.react:flipper-integration")
177-
178175
if (hermesEnabled.toBoolean()) {
179176
implementation("com.facebook.react:hermes-android")
180177
} else {
@@ -184,6 +181,8 @@ dependencies {
184181
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
185182
implementation("androidx.security:security-crypto-ktx:1.1.0-alpha06")
186183
implementation("com.android.volley:volley:1.2.1")
184+
implementation "com.google.firebase:firebase-messaging"
185+
187186

188187
// Branch.io
189188
implementation("io.branch.sdk.android:library:5.9.0")

apps/tlon-mobile/android/app/src/main/java/io/tlon/landscape/MainApplication.java

-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import androidx.annotation.NonNull;
77
import androidx.lifecycle.ProcessLifecycleOwner;
88

9-
import com.facebook.react.flipper.ReactNativeFlipper;
109
import com.facebook.react.PackageList;
1110
import com.facebook.react.ReactApplication;
1211
import com.facebook.react.ReactNativeHost;
@@ -72,9 +71,6 @@ public void onCreate() {
7271
// If you opted-in for the New Architecture, we load the native entry point for this app.
7372
DefaultNewArchitectureEntryPoint.load();
7473
}
75-
if (BuildConfig.DEBUG) {
76-
ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
77-
}
7874
ApplicationLifecycleDispatcher.onApplicationCreate(this);
7975
ProcessLifecycleOwner.get().getLifecycle().addObserver(new AppLifecycleManager());
8076

apps/tlon-mobile/android/build.gradle

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@ buildscript {
66
minSdkVersion = Integer.parseInt(findProperty('android.minSdkVersion') ?: '28')
77
compileSdkVersion = Integer.parseInt(findProperty('android.compileSdkVersion') ?: '34')
88
targetSdkVersion = Integer.parseInt(findProperty('android.targetSdkVersion') ?: '34')
9-
kotlinVersion = findProperty('android.kotlinVersion') ?: '1.8.10'
9+
kotlinVersion = findProperty('android.kotlinVersion') ?: '1.9.23'
1010

11-
ndkVersion = "25.1.8937393"
11+
ndkVersion = "26.1.10909125"
1212
}
1313
repositories {
1414
google()
1515
mavenCentral()
1616
}
1717
dependencies {
18-
classpath('com.google.gms:google-services:4.4.1')
18+
classpath('com.google.gms:google-services:4.4.2')
1919
classpath('com.android.tools.build:gradle')
2020
classpath('com.facebook.react:react-native-gradle-plugin')
21+
classpath('org.jetbrains.kotlin:kotlin-gradle-plugin')
2122
classpath('com.google.firebase:firebase-crashlytics-gradle:2.9.9')
2223
}
2324
}

apps/tlon-mobile/android/gradle.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ android.useAndroidX=true
2525
# Automatically convert third-party libraries to use AndroidX
2626
android.enableJetifier=true
2727

28-
# Version of flipper SDK to use with React Native
29-
FLIPPER_VERSION=0.125.0
30-
28+
# Enable AAPT2 PNG crunching
29+
android.enablePngCrunchInReleaseBuilds=true
30+
3131
# Use this property to specify which architecture you want to build.
3232
# You can also override it from the CLI using
3333
# ./gradlew <task> -PreactNativeArchitectures=x86_64

apps/tlon-mobile/android/gradle/wrapper/gradle-wrapper.properties

+1-1
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-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

apps/tlon-mobile/app.config.ts

+3
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
6868
runtimeVersion: '4.0.2',
6969
},
7070
plugins: [
71+
'expo-asset',
72+
'expo-localization',
73+
'expo-secure-store',
7174
'@react-native-firebase/app',
7275
'@react-native-firebase/crashlytics',
7376
'@react-native-firebase/perf',

apps/tlon-mobile/eas.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,4 @@
115115
}
116116
}
117117
}
118-
}
118+
}

apps/tlon-mobile/ios/Podfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ PODS:
234234
- ExpoModulesCore
235235
- ExpoBattery (8.0.1):
236236
- ExpoModulesCore
237-
- ExpoBlur (12.9.2):
237+
- ExpoBlur (13.0.3):
238238
- ExpoModulesCore
239239
- ExpoClipboard (6.0.3):
240240
- ExpoModulesCore
@@ -2185,7 +2185,7 @@ SPEC CHECKSUMS:
21852185
ExpoAsset: 323700f291684f110fb55f0d4022a3362ea9f875
21862186
ExpoBackgroundFetch: a06c553ecaf0bade0acd691042d996b9ce926327
21872187
ExpoBattery: 4b21f628f2b70af3af66e83c566949ba9cc65eb1
2188-
ExpoBlur: e832d874bd94afc0645daddbd3162ec1ce172080
2188+
ExpoBlur: 4d32f9e33bab18ae2ee079c7b0422e4210d49c97
21892189
ExpoClipboard: 23d203f5d4843699fbc45be1cc4fe1fbd811a6fa
21902190
ExpoDevice: fc94f0e42ecdfd897e7590f2874fc64dfa7e9b1c
21912191
ExpoFileSystem: 80bfe850b1f9922c16905822ecbf97acd711dc51

apps/tlon-mobile/package.json

+38-38
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
"@google-cloud/recaptcha-enterprise-react-native": "^18.3.0",
4747
"@gorhom/bottom-sheet": "^4.5.1",
4848
"@op-engineering/op-sqlite": "11.2.4",
49-
"@react-native-async-storage/async-storage": "1.21.0",
49+
"@react-native-async-storage/async-storage": "1.23.1",
5050
"@react-native-clipboard/clipboard": "^1.14.0",
51-
"@react-native-community/netinfo": "11.1.0",
51+
"@react-native-community/netinfo": "11.3.1",
5252
"@react-native-cookies/cookies": "^6.2.1",
5353
"@react-native-firebase/app": "^19.2.2",
5454
"@react-native-firebase/crashlytics": "^19.2.2",
@@ -57,7 +57,7 @@
5757
"@react-navigation/drawer": "^6.7.2",
5858
"@react-navigation/native": "^6.1.7",
5959
"@react-navigation/native-stack": "^6.9.13",
60-
"@shopify/flash-list": "1.6.3",
60+
"@shopify/flash-list": "1.6.4",
6161
"@tamagui/react-native-media-driver": "^1.116.12",
6262
"@tanstack/react-query": "~5.32.1",
6363
"@tloncorp/app": "workspace:*",
@@ -69,38 +69,38 @@
6969
"@urbit/nockjs": "^1.4.0",
7070
"classnames": "^2.3.2",
7171
"dotenv-expand": "^11.0.6",
72-
"expo": "~50.0.20",
73-
"expo-application": "~5.8.4",
74-
"expo-asset": "~9.0.2",
75-
"expo-av": "~13.10.5",
76-
"expo-background-fetch": "~11.8.1",
77-
"expo-battery": "^7.7.2",
78-
"expo-clipboard": "~5.0.1",
79-
"expo-constants": "~15.4.6",
80-
"expo-dev-client": "~3.3.12",
81-
"expo-device": "~5.9.4",
82-
"expo-file-system": "~16.0.9",
83-
"expo-haptics": "~12.8.1",
84-
"expo-image": "^1.10.6",
85-
"expo-image-manipulator": "~11.8.0",
86-
"expo-image-picker": "~14.7.1",
87-
"expo-linear-gradient": "^12.7.2",
88-
"expo-localization": "~14.8.4",
89-
"expo-media-library": "~15.9.2",
90-
"expo-modules-core": "~1.11.14",
91-
"expo-notifications": "~0.27.8",
92-
"expo-secure-store": "~12.8.1",
93-
"expo-splash-screen": "~0.26.5",
94-
"expo-status-bar": "~1.11.1",
95-
"expo-task-manager": "~11.7.3",
96-
"expo-updates": "~0.24.10",
72+
"expo": "~51.0.39",
73+
"expo-application": "~5.9.1",
74+
"expo-asset": "~10.0.10",
75+
"expo-av": "~14.0.7",
76+
"expo-background-fetch": "~12.0.1",
77+
"expo-battery": "^8.0.1",
78+
"expo-blur": "~13.0.3",
79+
"expo-clipboard": "~6.0.3",
80+
"expo-constants": "~16.0.2",
81+
"expo-dev-client": "~4.0.29",
82+
"expo-device": "~6.0.2",
83+
"expo-file-system": "~17.0.1",
84+
"expo-haptics": "~13.0.1",
85+
"expo-image": "~1.13.0",
86+
"expo-image-manipulator": "~12.0.5",
87+
"expo-image-picker": "~15.1.0",
88+
"expo-linear-gradient": "^13.0.2",
89+
"expo-localization": "~15.0.3",
90+
"expo-media-library": "~16.0.5",
91+
"expo-notifications": "~0.28.19",
92+
"expo-secure-store": "~13.0.2",
93+
"expo-splash-screen": "~0.27.7",
94+
"expo-status-bar": "~1.12.1",
95+
"expo-task-manager": "~11.8.2",
96+
"expo-updates": "~0.25.28",
9797
"immer": "^9.0.12",
9898
"libphonenumber-js": "^1.11.18",
9999
"lodash": "^4.17.21",
100100
"posthog-react-native": "^2.7.1",
101101
"react": "^18.2.0",
102102
"react-hook-form": "^7.52.0",
103-
"react-native": "0.73.9",
103+
"react-native": "0.74.5",
104104
"react-native-branch": "^5.9.0",
105105
"react-native-context-menu-view": "^1.15.0",
106106
"react-native-country-codes-picker": "^2.3.3",
@@ -110,13 +110,13 @@
110110
"react-native-get-random-values": "^1.11.0",
111111
"react-native-phone-input": "^1.3.7",
112112
"react-native-polyfill-globals": "^3.1.0",
113-
"react-native-reanimated": "^3.8.1",
114-
"react-native-safe-area-context": "^4.9.0",
115-
"react-native-screens": "~3.29.0",
113+
"react-native-reanimated": "~3.10.1",
114+
"react-native-safe-area-context": "4.10.5",
115+
"react-native-screens": "~3.31.1",
116116
"react-native-sse": "^1.2.1",
117-
"react-native-svg": "^15.0.0",
117+
"react-native-svg": "15.2.0",
118118
"react-native-url-polyfill": "^2.0.0",
119-
"react-native-webview": "13.6.4",
119+
"react-native-webview": "13.8.6",
120120
"seedrandom": "^3.0.5",
121121
"tailwind-rn": "^4.2.0",
122122
"text-encoding": "^0.7.0",
@@ -130,19 +130,19 @@
130130
"@tamagui/babel-plugin": "~1.112.12",
131131
"@testing-library/react-native": "^12.5.2",
132132
"@trivago/prettier-plugin-sort-imports": "^4.2.0",
133-
"@types/react": "^18.2.55",
133+
"@types/react": "18.2.55",
134134
"@types/seedrandom": "^3.0.5",
135135
"@types/tmp": "^0.2.6",
136136
"babel-plugin-inline-import": "^3.0.0",
137-
"babel-preset-expo": "^10.0.0",
137+
"babel-preset-expo": "~11.0.0",
138138
"better-sqlite3": "11.8.1",
139139
"concurrently": "^8.0.1",
140140
"connect": "^3.7.0",
141141
"cross-env": "^7.0.3",
142142
"dotenv": "^16.0.3",
143143
"drizzle-kit": "^0.28.0",
144144
"jest": "^29.7.0",
145-
"jest-expo": "^50.0.3",
145+
"jest-expo": "~51.0.4",
146146
"jest-fetch-mock": "^3.0.3",
147147
"ncp": "^2.0.0",
148148
"open": "^10.1.0",
@@ -155,4 +155,4 @@
155155
"tailwindcss": "^3.3.3",
156156
"vitest": "^1.0.4"
157157
}
158-
}
158+
}

packages/app/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"@tloncorp/shared": "workspace:*",
1717
"@tloncorp/ui": "workspace:*",
1818
"react-native-email-link": "^1.16.1",
19-
"expo-blur": "^12.9.2",
2019
"react-native-fetch-api": "^3.0.0",
2120
"react-native-polyfill-globals": "^3.1.0",
2221
"sqlocal": "^0.11.1"
@@ -29,8 +28,9 @@
2928
"tamagui": "~1.112.12",
3029
"@react-native-firebase/perf": "19.2.2",
3130
"expo-notifications": "~0.27.6",
31+
"expo-blur": "*",
3232
"lodash": "^4.17.21",
3333
"react-native-device-info": "^10.8.0",
3434
"zustand": "^3.7.2"
3535
}
36-
}
36+
}

packages/ui/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
"@uidotdev/usehooks": "^2.4.1",
4141
"any-ascii": "^0.3.1",
4242
"color2k": "^2.0.0",
43-
"expo-blur": "^12.9.2",
4443
"expo-haptics": "^12.8.1",
4544
"expo-image-picker": "~14.7.1",
4645
"expo-media-library": "~15.9.2",
@@ -62,6 +61,7 @@
6261
"@10play/tentap-editor": "~0.5.21",
6362
"@urbit/sigil-js": "^2.2.0",
6463
"expo-av": "~13.10.5",
64+
"expo-blur": "*",
6565
"expo-image": "*",
6666
"react": "*",
6767
"react-native-reanimated": "*",
@@ -71,4 +71,4 @@
7171
"devDependencies": {
7272
"@tamagui/build": "~1.112.12"
7373
}
74-
}
74+
}

0 commit comments

Comments
 (0)