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
6 changes: 6 additions & 0 deletions .idea/AndroidProjectSystem.xml

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

14 changes: 14 additions & 0 deletions .idea/appInsightsSettings.xml

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

6 changes: 0 additions & 6 deletions .idea/codeStyles/Project.xml

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

2 changes: 1 addition & 1 deletion .idea/codeStyles/codeStyleConfig.xml

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

5 changes: 1 addition & 4 deletions .idea/deploymentTargetSelector.xml

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

3 changes: 1 addition & 2 deletions .idea/gradle.xml

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

3 changes: 3 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

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

7 changes: 1 addition & 6 deletions .idea/misc.xml

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

4 changes: 4 additions & 0 deletions .kotlin/errors/errors-1738346278539.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
kotlin version: 2.0.20-RC
error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
1. Kotlin compile daemon is ready

4 changes: 4 additions & 0 deletions .kotlin/errors/errors-1739362815060.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
kotlin version: 2.0.20-RC
error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
1. Kotlin compile daemon is ready

4 changes: 4 additions & 0 deletions .kotlin/errors/errors-1749473483135.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
kotlin version: 2.0.20-RC
error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
1. Kotlin compile daemon is ready

68 changes: 53 additions & 15 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ plugins {

def googleMapsApiKey = System.getenv("GOOGLE_MAPS_API_KEY") ?: ""
def baseUrl = System.getenv("BASE_URL") ?: ""
def userGuideUrl = System.getenv("USER_GUIDE_URL") ?: ""
def dataPrivacyUrl = System.getenv("DATA_PRIVACY_URL") ?: ""

android {
namespace 'org.technoserve.farmcollector'
Expand All @@ -20,14 +22,16 @@ android {
applicationId "org.technoserve.farmcollector"
minSdk 21
targetSdk 35
versionCode 53
versionName "2.39"
versionCode 73
versionName "2.51"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
useSupportLibrary true
}
buildConfigField "String", "GOOGLE_MAPS_API_KEY", "\"${googleMapsApiKey}\""
buildConfigField "String", "BASE_URL", "\"${baseUrl}\""
buildConfigField "String", "USER_GUIDE_URL", "\"${userGuideUrl}\""
buildConfigField "String", "DATA_PRIVACY_URL","\"${dataPrivacyUrl}\""
}

buildTypes {
Expand All @@ -51,15 +55,57 @@ android {
}
}

def debugUserGuideUrl = project.rootProject.file("local.properties").with { propertiesFile ->
if (propertiesFile.exists()) {
def properties = new Properties()
properties.load(propertiesFile.newInputStream())
properties.getProperty("USER_GUIDE_URL", "default_debug_user_guide_url")
} else {
"default_debug_user_guide_url"
}
}

def releaseUserGuideUrl = project.rootProject.file("local.properties").with { propertiesFile ->
if (propertiesFile.exists()) {
def properties = new Properties()
properties.load(propertiesFile.newInputStream())
properties.getProperty("USER_GUIDE_URL", "default_release_user_guide_url")
} else {
"default_release_user_guide_url"
}
}
def debugDataPrivacyUrl = project.rootProject.file("local.properties").with { propertiesFile ->
if (propertiesFile.exists()) {
def properties = new Properties()
properties.load(propertiesFile.newInputStream())
properties.getProperty("DATA_PRIVACY_URL", "default_data_privacy_url")
} else {
"default_data_privacy_url"
}
}
def releaseDataPrivacyUrl = project.rootProject.file("local.properties").with { propertiesFile ->
if (propertiesFile.exists()) {
def properties = new Properties()
properties.load(propertiesFile.newInputStream())
properties.getProperty("DATA_PRIVACY_URL", "default_data_privacy_url")
} else {
"default_data_privacy_url"
}
}

debug {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard'
buildConfigField "String", "BASE_URL", "\"$debugBaseUrl\""
buildConfigField "String", "USER_GUIDE_URL", "\"$debugUserGuideUrl\""
buildConfigField "String", "DATA_PRIVACY_URL", "\"$debugDataPrivacyUrl\""
}
release {
minifyEnabled false
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
buildConfigField "String", "BASE_URL", "\"$releaseBaseUrl\""
buildConfigField "String", "USER_GUIDE_URL", "\"$releaseUserGuideUrl\""
buildConfigField "String", "DATA_PRIVACY_URL", "\"$releaseDataPrivacyUrl\""
}
}

Expand Down Expand Up @@ -98,11 +144,6 @@ android {
testOptions {
unitTests {
includeAndroidResources = true
// all {
// systemProperty 'robolectric.enabledSdks', '33'
// systemProperty 'robolectric.build.model', 'DEVICE'
// environment 'BUILD_FINGERPRINT', 'foo'
// }
}
}

Expand Down Expand Up @@ -130,11 +171,11 @@ dependencies {
implementation("androidx.compose.material3:material3:1.3.1")
implementation("androidx.compose.material3:material3-window-size-class:1.3.1")
implementation 'com.google.android.gms:play-services-ads-identifier:18.1.0'
// implementation 'androidx.work:work-runtime-ktx:2.10.0'
implementation 'androidx.work:work-runtime-ktx:2.9.0'
// implementation 'androidx.work:work-runtime:2.8.0'


implementation "com.google.accompanist:accompanist-systemuicontroller:0.32.0"

// camera dependencies

implementation 'androidx.camera:camera-core:1.4.0'
Expand Down Expand Up @@ -212,39 +253,36 @@ dependencies {

implementation "org.jetbrains.kotlin:kotlin-stdlib:2.0.20-RC"


implementation("androidx.datastore:datastore-preferences:1.0.0")

// Testing Dependencies

implementation 'androidx.navigation:navigation-testing:2.4.0-alpha04'
implementation 'androidx.test.ext:junit-ktx:1.2.1'

implementation 'com.jakewharton.timber:timber:5.0.1'

testImplementation "androidx.test:core:1.5.0"
testImplementation "org.mockito:mockito-core:5.7.0"
testImplementation "org.mockito.kotlin:mockito-kotlin:5.3.1"
testImplementation "io.mockk:mockk:1.13.7"
// testImplementation "org.robolectric:robolectric:4.10.3"
testImplementation 'com.google.dagger:hilt-android-testing:2.48'
testImplementation 'androidx.compose.ui:ui-test-junit4-android:1.7.5'
testImplementation 'androidx.arch.core:core-testing:2.2.0'
testImplementation "com.google.truth:truth:1.1.3"
testImplementation "io.mockk:mockk:1.13.7"
testImplementation "io.mockk:mockk-android:1.13.5"
//testImplementation "org.robolectric:robolectric:4.9"
testImplementation("androidx.work:work-testing:2.8.1")

// testImplementation("junit:junit:4.13.2")
testImplementation("org.robolectric:robolectric:4.13")



// testImplementation "org.robolectric:robolectric:4.11.1"
testImplementation "androidx.test:core:1.5.0"
testImplementation "androidx.test.ext:junit:1.1.5"
testImplementation "androidx.compose.ui:ui-test-junit4:1.5.4"



androidTestImplementation "androidx.work:work-testing:2.7.1"
androidTestImplementation "com.google.truth:truth:1.1.3"
androidTestImplementation "androidx.work:work-testing:2.7.1"
Expand Down
Binary file modified app/release/app-release.aab
Binary file not shown.
Loading