Feature/remove cose dependency (#71)

* - remove extra dependency on cose library;

* - updated dependency structure;

Author: MykhailoNester

build.gradle

@@ -8,8 +8,8 @@ buildscript {
     }
 
     dependencies {
-        classpath Deps.tools_gradle_android
-        classpath Deps.tools_kotlin
+        classpath "com.android.tools.build:gradle:4.1.3"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

buildSrc/.gitignore

@@ -4,16 +4,16 @@ plugins {
 }
 
 android {
-    compileSdkVersion Config.compileSdk
+    compileSdkVersion 29
 
     defaultConfig {
-        minSdkVersion Config.minSdk
-        targetSdkVersion Config.targetSdk
-        versionCode Config.versionCode
-        versionName Config.versionName
+        minSdkVersion 21
+        targetSdkVersion 30
+        versionCode 1
+        versionName "1.0.0"
 
-        testInstrumentationRunner Config.androidTestInstrumentation
-        consumerProguardFiles Config.proguardConsumerRules
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
     }
 
     buildTypes {
@@ -25,8 +25,8 @@ android {
 
     compileOptions {
         coreLibraryDesugaringEnabled = true
-        sourceCompatibility Config.javaVersion
-        targetCompatibility Config.javaVersion
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
@@ -42,21 +42,21 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring Deps.desugar_jdk_libs
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
 
-    implementation Deps.kotlin_stdlib
-    implementation Deps.kotlin_reflect
-    implementation Deps.java_cose
-    implementation(Deps.json_validation) {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.4.32"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:1.4.32"
+    implementation "com.upokecenter:cbor:4.5.1"
+    implementation("com.github.java-json-tools:json-schema-validator:2.2.14") {
         exclude group: "org.mozilla", module: "rhino"
     }
 
-    implementation Deps.jackson_cbor
-    implementation Deps.bouncy_castle
+    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.3"
+    implementation "org.bouncycastle:bcpkix-jdk15to18:1.68"
 
-    testImplementation Deps.test_junit
-    testImplementation Deps.test_junit_jupiter_api
-    testImplementation Deps.test_junit_jupiter_params
-    testImplementation Deps.test_hamcrest
-    testRuntimeOnly Deps.test_runtime_only
+    testImplementation "junit:junit:4.13.1"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.1"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:5.7.1"
+    testImplementation "org.hamcrest:hamcrest:2.2"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.1"
 }

buildSrc/build.gradle.kts

@@ -22,11 +22,11 @@
 
 package dgca.verifier.app.decoder
 
-import COSE.HeaderKeys
 import com.upokecenter.cbor.CBORObject
 import dgca.verifier.app.decoder.base45.Base45Decoder
 import dgca.verifier.app.decoder.cbor.DefaultGreenCertificateMapper
 import dgca.verifier.app.decoder.cbor.GreenCertificateMapper
+import dgca.verifier.app.decoder.cose.HEADER_KID
 import dgca.verifier.app.decoder.cwt.CwtHeaderKeys
 import dgca.verifier.app.decoder.model.CoseData
 import dgca.verifier.app.decoder.model.GreenCertificate
@@ -86,7 +86,7 @@ class DefaultCertificateDecoder(
         val content = messageObject[2].GetByteString()
         val rgbProtected = messageObject[0].GetByteString()
         val rgbUnprotected = messageObject[1]
-        val key = HeaderKeys.KID.AsCBOR()
+        val key = CBORObject.FromObject(HEADER_KID)
 
         if (!CBORObject.DecodeFromBytes(rgbProtected).keys.contains(key)) {
             val objunprotected = rgbUnprotected.get(key).GetByteString()

buildSrc/src/main/java/AppConfig.kt

@@ -22,12 +22,13 @@
 
 package dgca.verifier.app.decoder.cose
 
-import COSE.HeaderKeys
 import com.google.common.primitives.Bytes
 import com.upokecenter.cbor.CBORObject
 import dgca.verifier.app.decoder.model.CoseData
 import dgca.verifier.app.decoder.model.VerificationResult
 
+const val HEADER_KID = 4
+
 /**
  * Decodes input according to COSE specification (RFC8152)
  */
@@ -49,7 +50,7 @@ class DefaultCoseService : CoseService {
     }
 
     private fun getKid(protectedHeader: ByteArray, unprotectedHeader: CBORObject): CBORObject? {
-        val key = HeaderKeys.KID.AsCBOR()
+        val key = CBORObject.FromObject(HEADER_KID)
         return if (protectedHeader.isNotEmpty()) {
             try {
                 val kid = CBORObject.DecodeFromBytes(protectedHeader).get(key)