Skip to content
Open
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
25 changes: 18 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ext {
// Year.Month.MajorVersion.patch
app_version = getDate()
app_major_version = 1
app_version_code = 140
app_version_code = 141
app_version_name = "$app_version.$app_major_version.$app_version_code"
}

Expand All @@ -26,7 +26,7 @@ static def getDate() {
}

android {
compileSdk 34
compileSdk 36

signingConfigs {
release {
Expand Down Expand Up @@ -57,7 +57,7 @@ android {
applicationId "com.gy.chatpaths.aac.app"
// The Billing API must be 3+ and sdk 26 is 2.0
minSdkVersion 27
targetSdkVersion 34
targetSdkVersion 36
versionCode app_version_code
versionName app_version_name
resourceConfigurations += ['en', 'es', 'fr', 'hi']
Expand Down Expand Up @@ -92,14 +92,15 @@ android {

buildTypes {
debug {
testCoverageEnabled true
pseudoLocalesEnabled true
pseudoLocalesEnabled true
versionNameSuffix '.debug'
manifestPlaceholders applicationName: 'ChatPaths Debug'
firebaseCrashlytics {
mappingFileUploadEnabled false
}
}
enableUnitTestCoverage true
enableAndroidTestCoverage true
}
release {
minifyEnabled true
shrinkResources true
Expand Down Expand Up @@ -145,6 +146,16 @@ android {
dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
// implementation libs.androidx.core.ktx
implementation (libs.asset.delivery) {
exclude group: 'com.google.android.play', module: 'core'
}
// implementation libs.asset.delivery.ktx
implementation libs.feature.delivery
// implementation libs.feature.delivery.ktx
implementation libs.review
// implementation libs.review.ktx
implementation libs.app.update
// implementation libs.app.update.ktx
implementation libs.androidx.appcompat
implementation libs.androidx.core.splashscreen
implementation libs.androidx.legacy.support.v4
Expand All @@ -171,7 +182,7 @@ dependencies {
implementation libs.review

// For Kotlin users, also add the Kotlin extensions library for Play In-App Review:
implementation libs.review.ktx
// implementation libs.review.ktx


testImplementation libs.junit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package com.gy.chatpaths.aac.app.di.module

import android.content.Context
import com.google.firebase.FirebaseApp
import com.google.firebase.analytics.ktx.analytics
import com.google.firebase.ktx.Firebase
import com.google.firebase.analytics.analytics
import com.google.firebase.Firebase
import com.google.firebase.remoteconfig.FirebaseRemoteConfig
import com.google.firebase.remoteconfig.ktx.remoteConfig
import com.google.firebase.remoteconfig.ktx.remoteConfigSettings
import com.google.firebase.remoteconfig.remoteConfig
import com.google.firebase.remoteconfig.remoteConfigSettings
import com.gy.chatpaths.aac.app.BuildConfig
import com.gy.chatpaths.aac.app.R
import dagger.hilt.android.qualifiers.ApplicationContext
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import javax.inject.Inject
import javax.inject.Singleton
import androidx.core.net.toUri

@Singleton
class LocalCPDataSource
Expand Down Expand Up @@ -140,7 +141,7 @@ class LocalCPDataSource
// Get the anchored elements off the list and added to the new list
while (it.isNotEmpty()) {
if (it.first().anchored) {
newList.add(it.removeFirst())
newList.add(it.removeAt(0))
} else {
break
}
Expand Down Expand Up @@ -617,7 +618,7 @@ class LocalCPDataSource
promptUriString?.let {
// audio prompts are not shared, so we can just delete it
try {
val oldPromptUri = Uri.parse(promptUriString)
val oldPromptUri = promptUriString.toUri()
oldPromptUri.toFile().delete()
} catch (e: RuntimeException) {
Log.d(tag, "exception with deleting audio: $e")
Expand Down
86 changes: 47 additions & 39 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,50 +1,52 @@
[versions]
appcompat = "1.6.1"
appcompat = "1.7.1"
assetDelivery = "2.3.0"
cardview = "1.0.0"
constraintlayout = "2.1.4"
core = "1.10.3"
coreKtx = "1.13.0"
constraintlayout = "2.2.1"
#core = "1.10.3"
coreKtx = "1.16.0"
coreKtxVersion = "1.8.1"
coreSplashscreen = "1.0.1"
devtoolsKsp = "1.9.23-1.0.20"
espressoCore = "3.5.1"
firebaseAnalyticsKtx = "21.6.2"
firebaseBom = "32.8.1"
firebaseConfigKtx = "21.6.3"
firebaseCrashlyticsGradle = "2.9.9"
firebaseCrashlyticsKtx = "18.6.4"
firebaseMessagingKtx = "23.4.1"
fragmentKtx = "1.6.2"
googleServices = "4.4.1"
gradle = "8.3.2"
hiltAndroid = "2.51.1"
devtoolsKsp = "2.2.0-2.0.2"
espressoCore = "3.6.1"
featureDelivery = "2.1.0"
firebaseAnalyticsKtx = "23.0.0"
firebaseBom = "34.0.0"
firebaseConfigKtx = "23.0.0"
firebaseCrashlyticsGradle = "3.0.5"
firebaseCrashlyticsKtx = "20.0.0"
firebaseMessagingKtx = "25.0.0"
fragmentKtx = "1.8.8"
googleServices = "4.4.3"
gradle = "8.11.1"
hiltAndroid = "2.57"
junit = "4.13.2"
junitVersion = "1.1.5"
kotlinGradlePlugin = "1.9.23"
kotlinStdlibJdk7 = "1.9.23"
kotlinxCoroutinesAndroid = "1.8.0"
junitVersion = "1.2.1"
kotlinGradlePlugin = "2.2.0"
kotlinStdlibJdk7 = "2.2.0"
kotlinxCoroutinesAndroid = "1.10.2"
legacySupportV4 = "1.0.0"
lifecycleCommonJava8 = "2.7.0"
material = "1.11.0"
lifecycleCommonJava8 = "2.9.2"
material = "1.12.0"
materialTapTargetPrompt = "3.3.2"
mockitoAndroid = "5.11.0"
mockitoCore = "5.11.0"
navigationFragmentKtx = "2.7.7"
orchestrator = "1.4.2"
mockitoAndroid = "5.18.0"
mockitoCore = "5.18.0"
navigationFragmentKtx = "2.9.2"
orchestrator = "1.5.1"
ossLicensesPlugin = "0.10.6"
paletteKtx = "1.0.0"
playServicesOssLicenses = "17.0.1"
playServicesOssLicenses = "17.2.1"
preferenceKtx = "1.2.1"
recyclerview = "1.3.2"
review = "2.0.1"
roomRuntime = "2.6.1"
runner = "1.5.2"
spotless = "6.25.0"
truth = "1.5.0"
truthVersion = "1.4.2"
recyclerview = "1.4.0"
review = "2.0.2"
roomRuntime = "2.7.2"
runner = "1.6.2"
spotless = "7.2.1"
truth = "1.6.0"
truthVersion = "1.4.4"
ucrop = "2.2.8"
viewpager2 = "1.0.0"
workTesting = "2.9.0"
viewpager2 = "1.1.0"
workTesting = "2.10.2"

[libraries]
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
Expand Down Expand Up @@ -76,8 +78,14 @@ androidx-runner = { module = "androidx.test:runner", version.ref = "runner" }
androidx-truth = { module = "androidx.test.ext:truth", version.ref = "truth" }
androidx-viewpager2 = { module = "androidx.viewpager2:viewpager2", version.ref = "viewpager2" }
androidx-work-testing = { module = "androidx.work:work-testing", version.ref = "workTesting" }
core = { module = "com.google.android.play:core", version.ref = "core" }
app-update = { module = "com.google.android.play:app-update", version.ref = "featureDelivery" }
#app-update-ktx = { module = "com.google.android.play:app-update-ktx", version.ref = "featureDelivery" }
asset-delivery = { module = "com.google.android.play:asset-delivery", version.ref = "assetDelivery" }
#asset-delivery-ktx = { module = "com.google.android.play:asset-delivery-ktx", version.ref = "assetDelivery" }
#core = { module = "com.google.android.play:core", version.ref = "core" }
core-ktx = { module = "com.google.android.play:core-ktx", version.ref = "coreKtxVersion" }
feature-delivery = { module = "com.google.android.play:feature-delivery", version.ref = "featureDelivery" }
#feature-delivery-ktx = { module = "com.google.android.play:feature-delivery-ktx", version.ref = "featureDelivery" }
firebase-analytics = { module = "com.google.firebase:firebase-analytics", version.ref = "firebaseAnalyticsKtx" }
firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }
firebase-config = { module = "com.google.firebase:firebase-config", version.ref = "firebaseConfigKtx" }
Expand All @@ -101,9 +109,9 @@ mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockitoCore
oss-licenses-plugin = { module = "com.google.android.gms:oss-licenses-plugin", version.ref = "ossLicensesPlugin" }
play-services-oss-licenses = { module = "com.google.android.gms:play-services-oss-licenses", version.ref = "playServicesOssLicenses" }
review = { module = "com.google.android.play:review", version.ref = "review" }
review-ktx = { module = "com.google.android.play:review-ktx", version.ref = "review" }
#review-ktx = { module = "com.google.android.play:review-ktx", version.ref = "review" }
truth = { module = "com.google.truth:truth", version.ref = "truthVersion" }
truth-java8-extension = { module = "com.google.truth.extensions:truth-java8-extension", version.ref = "truthVersion" }
truth-java8-extension = { module = "com.google.truth.extensions:truth-java8-extension", version = "1.4.4" }
ucrop = { module = "com.github.yalantis:ucrop", version.ref = "ucrop" }

[plugins]
Expand Down
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Aug 08 19:42:13 EDT 2021
#Sun Jul 27 12:22:06 EDT 2025
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading