diff --git a/.gitignore b/.gitignore index 85be372d4..961268360 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ local.properties android/*/bin/**/*.class libs/*/bin/**/*.class .cxx +*.hprof android/build android/*/build diff --git a/android/build.gradle b/android/build.gradle index a056c32a1..6f789dcbe 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -8,6 +8,9 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' + +apply plugin: 'kotlinx-serialization' + android { compileSdkVersion rootProject.compileSdkVersion buildToolsVersion rootProject.buildToolsVersion @@ -72,6 +75,8 @@ android { implementation deps.supportAppCompat implementation deps.supportSqlite implementation deps.websocket + implementation deps.kotlinxSerializationJson + testImplementation deps.mockito testImplementation deps.robolectric diff --git a/build.gradle b/build.gradle index 8d9ea2570..9c929ffb8 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,7 @@ buildscript { classpath 'com.vanniktech:gradle-maven-publish-plugin:0.20.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION" classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.10" + classpath "org.jetbrains.kotlin:kotlin-serialization:$KOTLIN_VERSION" } } @@ -75,6 +76,7 @@ ext.deps = [ websocket : 'org.java-websocket:Java-WebSocket:1.5.3', openssl : 'com.android.ndk.thirdparty:openssl:1.1.1l-beta-1', // Annotations + kotlinxSerializationJson : "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0", jsr305 : 'com.google.code.findbugs:jsr305:3.0.2', inferAnnotations : 'com.facebook.infer.annotation:infer-annotation:0.18.0', proguardAnnotations: 'com.facebook.yoga:proguard-annotations:1.19.0',