Skip to content

Commit

Permalink
WIP: NS is broken at this commit, but I am working on migrating the m…
Browse files Browse the repository at this point in the history
…ain activity to Kotlin and Jetpack Compose. Still a lot of work to do
  • Loading branch information
christianrowlands committed Oct 22, 2024
1 parent b4d4fa3 commit d39379b
Show file tree
Hide file tree
Showing 21 changed files with 1,516 additions and 801 deletions.
17 changes: 10 additions & 7 deletions networksurvey/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ apply plugin: 'dagger.hilt.android.plugin'


ext.androidVersion = '28.0.0'
ext.grpcVersion = '1.65.1'
ext.grpcVersion = '1.68.0'
ext.networkSurveyMessagingVersion = '1.6.0'
ext.navigationVersion = '2.8.1'
ext.navigationVersion = '2.8.3'

android {
compileSdk 35
Expand Down Expand Up @@ -108,6 +108,8 @@ dependencies {
implementation "androidx.navigation:navigation-ui-ktx:${navigationVersion}"
implementation "androidx.navigation:navigation-compose:${navigationVersion}"
implementation "androidx.viewpager2:viewpager2:1.1.0"
implementation "androidx.activity:activity-compose:1.9.3"
implementation "androidx.drawerlayout:drawerlayout:1.2.0"
implementation 'com.google.android.flexbox:flexbox:3.0.0'

implementation "io.grpc:grpc-stub:${grpcVersion}"
Expand All @@ -121,7 +123,7 @@ dependencies {
implementation("com.craxiom:network-survey-messaging:${networkSurveyMessagingVersion}") {
exclude group: 'com.google.api.grpc', module: 'proto-google-common-protos'
}
implementation "com.google.protobuf:protobuf-java-util:4.27.3"
implementation "com.google.protobuf:protobuf-java-util:4.28.2"

implementation "mil.nga.geopackage:geopackage-android:6.7.3"
implementation 'org.apache.commons:commons-csv:1.10.0'
Expand All @@ -140,6 +142,7 @@ dependencies {
implementation 'com.google.zxing:core:3.5.3'

implementation "com.google.dagger:dagger:$hilt_version"
implementation 'androidx.compose.ui:ui-viewbinding:1.7.4'
kapt "com.google.dagger:dagger-compiler:$hilt_version"
implementation "com.google.dagger:hilt-android:$hilt_version"
kapt "com.google.dagger:hilt-compiler:$hilt_version"
Expand All @@ -152,7 +155,7 @@ dependencies {
implementation 'com.squareup.retrofit2:converter-gson:2.11.0'

// Compose
def composeBom = platform('androidx.compose:compose-bom:2024.09.02')
def composeBom = platform('androidx.compose:compose-bom:2024.10.00')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand All @@ -166,16 +169,16 @@ dependencies {
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose"
implementation "androidx.lifecycle:lifecycle-runtime-compose"
implementation 'androidx.compose.ui:ui-tooling:1.7.2'
implementation 'androidx.compose.ui:ui-tooling:1.7.4'
implementation "com.google.accompanist:accompanist-themeadapter-material:0.28.0"

// Only include firebase in the google play build
regularImplementation platform('com.google.firebase:firebase-bom:33.3.0')
regularImplementation platform('com.google.firebase:firebase-bom:33.5.0')
regularImplementation 'com.google.firebase:firebase-analytics'
regularImplementation 'com.google.firebase:firebase-crashlytics'

testImplementation 'junit:junit:4.13.2'
implementation 'androidx.annotation:annotation:1.8.2'
implementation 'androidx.annotation:annotation:1.9.0'

// Uncomment if you want to hunt for memory leaks
//debugImplementation 'com.squareup.leakcanary:leakcanary-android:3.0-alpha-1'
Expand Down
Loading

0 comments on commit d39379b

Please sign in to comment.