Skip to content
Merged
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
36 changes: 20 additions & 16 deletions sdk/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
plugins {
id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
id("com.google.devtools.ksp")
}

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
apply plugin: 'jacoco'

jacoco {
Expand All @@ -16,6 +16,7 @@ repositories {
}

android {
namespace 'com.microsoft.did.sdk'
compileSdkVersion compile_sdk_version as Integer

defaultConfig {
Expand All @@ -25,11 +26,9 @@ android {
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

kapt {
arguments {
arg("room.schemaLocation", "$projectDir/schemas")
arg("room.incremental", "true")
}
ksp {
arg("room.schemaLocation", "$projectDir/schemas")
arg("room.incremental", "true")
}
}
buildTypes {
Expand All @@ -46,28 +45,32 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility target_jvmTarget
targetCompatibility target_jvmTarget
}

testOptions {
unitTestVariants.all {
testDebugUnitTest.useJUnit()
}
unitTests.all {
jvmArgs '--add-opens', 'java.base/java.util=ALL-UNNAMED',
'--add-opens', 'java.base/java.security=ALL-UNNAMED'
}
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = target_jvmTarget
freeCompilerArgs += "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes"
}

lintOptions {
lint {
disable 'MissingClass'
disable 'UseKtx'
abortOnError false
warningsAsErrors false
textReport true
textOutput "stdout"
explainIssues true
showAll true
}

sourceSets {
Expand All @@ -83,15 +86,15 @@ android {

dependencies {
implementation "com.google.dagger:dagger:$dagger_version"
kapt "com.google.dagger:dagger-compiler:$dagger_version"
ksp "com.google.dagger:dagger-compiler:$dagger_version"

implementation "com.squareup.retrofit2:retrofit:$retrofit2_version"
implementation "com.squareup.retrofit2:converter-scalars:$retrofit2_version"
implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0"

implementation "androidx.room:room-runtime:$androidx_room_persistence_version"
implementation "androidx.room:room-ktx:$androidx_room_persistence_version"
kapt "androidx.room:room-compiler:$androidx_room_persistence_version"
ksp "androidx.room:room-compiler:$androidx_room_persistence_version"
testImplementation "androidx.room:room-testing:$androidx_room_persistence_version"

implementation "com.squareup.okhttp3:okhttp:$com_squareup_okhttp3_okhttp_version"
Expand Down Expand Up @@ -130,6 +133,7 @@ dependencies {
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
testImplementation "io.mockk:mockk:$mockk_version"
testImplementation "org.bouncycastle:bcprov-jdk15to18:$org_bouncycastle_bcprov"
testImplementation 'com.willowtreeapps.assertk:assertk-jvm:0.21'
testImplementation "org.assertj:assertj-core:$assertj_test_version"
testImplementation "junit:junit:$junit_version"
Expand All @@ -141,8 +145,8 @@ dependencies {
*/
task jacocoCoverageReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'createDebugCoverageReport']) {
reports {
xml.enabled = true
html.enabled = true
xml.required = true
html.required = true
}

final def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*',
Expand Down

This file was deleted.

14 changes: 1 addition & 13 deletions sdk/src/sharedTest/java/com/microsoft/did/sdk/di/Serializer.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,4 @@

package com.microsoft.did.sdk.di

import com.microsoft.did.sdk.backup.content.microsoft2020.TestVcMetaData
import com.microsoft.did.sdk.backup.content.microsoft2020.VcMetadata
import kotlinx.serialization.modules.SerializersModule
import kotlinx.serialization.modules.polymorphic
import kotlinx.serialization.modules.subclass

val defaultTestSerializer = SdkModule().defaultJsonSerializer(
SerializersModule {
polymorphic(VcMetadata::class) {
subclass(TestVcMetaData::class)
}
}
)
val defaultTestSerializer = SdkModule().defaultJsonSerializer()
120 changes: 0 additions & 120 deletions sdk/src/test/java/android/util/BackupTestUtil.kt

This file was deleted.

Loading
Loading