Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set default values on ProUser data class #1116

Merged
merged 13 commits into from
Jul 4, 2024
Merged

Set default values on ProUser data class #1116

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f02d57c
Set default values on ProUser data class
atavism Jul 3, 2024
ee7e6d2
Update checksum
atavism Jul 3, 2024
876daf6
use gradle 8.4.0 plugin for now
atavism Jul 3, 2024
148008e
update sentry
atavism Jul 3, 2024
579a02b
use kotlinx.serialization
atavism Jul 3, 2024
38a74d2
use kotlinx.serialization
atavism Jul 3, 2024
590a99e
updates to use kotlinx.serialization
atavism Jul 3, 2024
37c0254
Remove old ProPlan
atavism Jul 3, 2024
b80a3f3
clean-ups, update logging
atavism Jul 3, 2024
8f165fb
Update checksum
atavism Jul 3, 2024
0eefb6a
Updated android-db and messages.
jigar-f Jul 4, 2024
f0be62b
Added more error handling.
jigar-f Jul 4, 2024
8b99194
Add tryParseJson utility method (#1117)
atavism Jul 4, 2024
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
7 changes: 5 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
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 Down
363 changes: 0 additions & 363 deletions android/app/src/main/java/org/getlantern/lantern/model/ProPlan.java
View file
Open in desktop

This file was deleted.

Loading
Loading