mirror of
https://github.com/permissionlesstech/bitchat-android.git
synced 2026-07-25 04:05:21 +00:00
Merge pull request #60 from prudhvir3ddy/prudhvir3ddy/upgrade_deps
Upgrade compileSDK, kotlin, AGP, compose, core libs
This commit is contained in:
@@ -2,6 +2,7 @@ plugins {
|
|||||||
alias(libs.plugins.android.application)
|
alias(libs.plugins.android.application)
|
||||||
alias(libs.plugins.kotlin.android)
|
alias(libs.plugins.kotlin.android)
|
||||||
alias(libs.plugins.kotlin.parcelize)
|
alias(libs.plugins.kotlin.parcelize)
|
||||||
|
alias(libs.plugins.kotlin.compose)
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
@@ -41,9 +42,6 @@ android {
|
|||||||
buildFeatures {
|
buildFeatures {
|
||||||
compose = true
|
compose = true
|
||||||
}
|
}
|
||||||
composeOptions {
|
|
||||||
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
|
|
||||||
}
|
|
||||||
packaging {
|
packaging {
|
||||||
resources {
|
resources {
|
||||||
excludes += "/META-INF/{AL2.0,LGPL2.1}"
|
excludes += "/META-INF/{AL2.0,LGPL2.1}"
|
||||||
|
|||||||
@@ -353,11 +353,11 @@ class MainActivity : ComponentActivity() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onNewIntent(intent: Intent?) {
|
override fun onNewIntent(intent: Intent) {
|
||||||
super.onNewIntent(intent)
|
super.onNewIntent(intent)
|
||||||
// Handle notification intents when app is already running
|
// Handle notification intents when app is already running
|
||||||
if (onboardingState == OnboardingState.COMPLETE) {
|
if (onboardingState == OnboardingState.COMPLETE) {
|
||||||
intent?.let { handleNotificationIntent(it) }
|
handleNotificationIntent(intent)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,4 +3,5 @@ plugins {
|
|||||||
alias(libs.plugins.android.application) apply false
|
alias(libs.plugins.android.application) apply false
|
||||||
alias(libs.plugins.kotlin.android) apply false
|
alias(libs.plugins.kotlin.android) apply false
|
||||||
alias(libs.plugins.android.library) apply false
|
alias(libs.plugins.android.library) apply false
|
||||||
|
alias(libs.plugins.kotlin.compose) apply false
|
||||||
}
|
}
|
||||||
|
|||||||
+16
-16
@@ -1,36 +1,35 @@
|
|||||||
[versions]
|
[versions]
|
||||||
# Android and Kotlin
|
# Android and Kotlin
|
||||||
agp = "8.2.0"
|
agp = "8.10.1"
|
||||||
kotlin = "1.9.20"
|
kotlin = "2.2.0"
|
||||||
compileSdk = "34"
|
compileSdk = "35"
|
||||||
minSdk = "26" # API 26 for proper BLE support
|
minSdk = "26" # API 26 for proper BLE support
|
||||||
targetSdk = "34"
|
targetSdk = "34"
|
||||||
|
|
||||||
# AndroidX Core
|
# AndroidX Core
|
||||||
core-ktx = "1.12.0"
|
core-ktx = "1.16.0"
|
||||||
lifecycle-runtime = "2.7.0"
|
lifecycle-runtime = "2.9.1"
|
||||||
activity-compose = "1.8.2"
|
activity-compose = "1.10.1"
|
||||||
appcompat = "1.6.1"
|
appcompat = "1.7.1"
|
||||||
|
|
||||||
# Compose
|
# Compose
|
||||||
compose-bom = "2023.10.01"
|
compose-bom = "2025.06.01"
|
||||||
compose-compiler = "1.5.5"
|
|
||||||
|
|
||||||
# Navigation
|
# Navigation
|
||||||
navigation-compose = "2.7.6"
|
navigation-compose = "2.9.1"
|
||||||
|
|
||||||
# Accompanist
|
# Accompanist
|
||||||
accompanist-permissions = "0.32.0"
|
accompanist-permissions = "0.37.3"
|
||||||
|
|
||||||
# Cryptography
|
# Cryptography
|
||||||
bouncycastle = "1.70"
|
bouncycastle = "1.70"
|
||||||
tink-android = "1.10.0"
|
tink-android = "1.10.0"
|
||||||
|
|
||||||
# JSON
|
# JSON
|
||||||
gson = "2.10.1"
|
gson = "2.13.1"
|
||||||
|
|
||||||
# Coroutines
|
# Coroutines
|
||||||
kotlinx-coroutines = "1.7.3"
|
kotlinx-coroutines = "1.10.2"
|
||||||
|
|
||||||
# Bluetooth
|
# Bluetooth
|
||||||
nordic-ble = "2.6.1"
|
nordic-ble = "2.6.1"
|
||||||
@@ -39,12 +38,12 @@ nordic-ble = "2.6.1"
|
|||||||
lz4-java = "1.8.0"
|
lz4-java = "1.8.0"
|
||||||
|
|
||||||
# Security
|
# Security
|
||||||
security-crypto = "1.1.0-alpha06"
|
security-crypto = "1.1.0-beta01"
|
||||||
|
|
||||||
# Testing
|
# Testing
|
||||||
junit = "4.13.2"
|
junit = "4.13.2"
|
||||||
androidx-test-ext = "1.1.5"
|
androidx-test-ext = "1.2.1"
|
||||||
espresso = "3.5.1"
|
espresso = "3.6.1"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
# AndroidX Core
|
# AndroidX Core
|
||||||
@@ -104,6 +103,7 @@ android-application = { id = "com.android.application", version.ref = "agp" }
|
|||||||
android-library = { id = "com.android.library", version.ref = "agp" }
|
android-library = { id = "com.android.library", version.ref = "agp" }
|
||||||
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
|
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
|
||||||
kotlin-parcelize = { id = "kotlin-parcelize" }
|
kotlin-parcelize = { id = "kotlin-parcelize" }
|
||||||
|
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
|
||||||
|
|
||||||
[bundles]
|
[bundles]
|
||||||
compose = [
|
compose = [
|
||||||
|
|||||||
Reference in New Issue
Block a user