Skip to content

Commit

Permalink
Set default values on ProUser data class (#1116)
Browse files Browse the repository at this point in the history
* Set default values on ProUser data class

* Update checksum

* use gradle 8.4.0 plugin for now

* update sentry

* use kotlinx.serialization

* use kotlinx.serialization

* updates to use kotlinx.serialization

* Remove old ProPlan

* clean-ups, update logging

* Update checksum

* Updated android-db and messages.

* Added more error handling.

* Add tryParseJson utility method (#1117)

* Add tryParseJson utility method

* formatting

---------

Co-authored-by: Jigar-f <jigar@getlantern.org>
  • Loading branch information
atavism and jigar-f authored Jul 4, 2024
1 parent 119d382 commit 042186e
Show file tree
Hide file tree
Showing 18 changed files with 240 additions and 494 deletions.
11 changes: 7 additions & 4 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'kotlinx-serialization'
id 'dev.flutter.flutter-gradle-plugin'
id 'org.jlleitschuh.gradle.ktlint'
id 'org.jetbrains.kotlin.android'
id 'kotlin-parcelize'
id 'kotlin-kapt'
id 'com.google.protobuf'
id "io.sentry.android.gradle" version "4.2.0"
id "io.sentry.android.gradle" version "4.9.0"
}

android {
ndkVersion "26.0.10792818"
ndkVersion "26.1.10909125"

bundle {
density {
Expand Down Expand Up @@ -367,6 +368,8 @@ configurations {
dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.5"
implementation "com.google.protobuf:protobuf-javalite:$protoc_version"
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1'

coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$desugarJdk"
implementation fileTree(dir: "libs", include: "liblantern-${androidArch()}.aar")
implementation fileTree(dir: 'libs', include: '*.jar')
Expand All @@ -393,8 +396,8 @@ dependencies {
// from https://github.com/getlantern/opus_android
implementation files('libs/opuslib-release.aar')
implementation 'com.github.getlantern:secrets-android:f6a7a69f3d'
implementation 'com.github.getlantern:db-android:5a082e0bdd'
implementation 'com.github.getlantern:messaging-android:ca369d5173'
implementation 'com.github.getlantern:db-android:2e81ba6542'
implementation 'com.github.getlantern:messaging-android:3f23f07b4e'

debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
//Test implementation
Expand Down
Loading

0 comments on commit 042186e

Please sign in to comment.