Merge pull request #1 from VirgilSecurity/dev

Multi module + Coroutines

Author: BuddahLD

.travis.yml

@@ -2,15 +2,10 @@ language: android
 sudo: required
 jdk: oraclejdk8
 
-# Exclude branches
-branches:
-  except:
-  - dev
-  - v0.1
-
 # Include branches
 branches:
   only:
+  - dev
   - master
 
 before_cache:

build.gradle

@@ -1,12 +1,25 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     ext.versions = [
+            // Virgil
             virgilSdk : '5.0.4',
+            pythia : '0.2.0',
+            keyknox : '0.1.1',
+
+            // Kotlin
             kotlin    : '1.3.0',
-            coroutines: '0.30.2',
-            dokka     : '0.9.17',
+            coroutines: '1.0.0-RC1',
+
+            // Gradle
+            gardle    : '3.2.1',
+
+            // Android
             android   : '4.1.1.4',
+
+            // Docs
+            dokka     : '0.9.17',
+
+            // Tests
+            junit     : '5.2.0',
     ]
     repositories {
         google()
@@ -15,9 +28,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
+        classpath "com.android.tools.build:gradle:$versions.gardle"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$versions.dokka"
     }
 }
 
@@ -33,3 +46,65 @@ allprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+enum ArtifactType {
+    ALL,
+    STANDARD,
+    COROUTINES
+}
+
+static String getArtifactType(Project project) {
+    def systemProperty = null
+    if (System.getenv('ARTIFACT_TYPE') != null)
+        systemProperty = System.getenv('ARTIFACT_TYPE')
+    if (System.getProperty('ARTIFACT_TYPE') != null)
+        systemProperty = System.getProperty('ARTIFACT_TYPE')
+
+    if (systemProperty != null)
+        return systemProperty
+    else if (project.hasProperty('ARTIFACT_TYPE')) {
+        return project.findProperty('ARTIFACT_TYPE')
+    } else {
+        return "No artifact type is provided. Please, use -DARTIFACT_TYPE property."
+    }
+}
+
+task installEthree() {
+    def artifactType
+    try {
+        artifactType = getArtifactType(project) as ArtifactType
+    } catch (IllegalArgumentException ignored) {
+        throw new IllegalArgumentException("Please, choose one of the available types: " + ArtifactType.values() + "."
+                + " You entered: " + getArtifactType(project))
+    }
+
+    if (artifactType == ArtifactType.STANDARD) {
+        dependsOn ':ethree:install'
+    } else if (artifactType == ArtifactType.COROUTINES) {
+        dependsOn ':ethreeCoroutines:install'
+    } else if (artifactType == ArtifactType.ALL) {
+        dependsOn ':ethree:install', ':ethreeCoroutines:install'
+    } else {
+        throw new IllegalArgumentException("Please, choose one of artifacts type: " + ArtifactType.values())
+    }
+}
+
+task publishEthree() {
+    def artifactType
+    try {
+        artifactType = getArtifactType(project) as ArtifactType
+    } catch (IllegalArgumentException ignored) {
+        throw new IllegalArgumentException("Please, choose one of the available types: " + ArtifactType.values() + "."
+                + " You entered: " + getArtifactType(project))
+    }
+
+    if (artifactType == ArtifactType.STANDARD) {
+        dependsOn ':ethree:publish'
+    } else if (artifactType == ArtifactType.COROUTINES) {
+        dependsOn ':ethreeCoroutines:publish'
+    } else if (artifactType == ArtifactType.ALL) {
+        dependsOn ':ethree:publish', ':ethreeCoroutines:publish'
+    } else {
+        throw new IllegalArgumentException("Please, choose one of artifacts type: " + ArtifactType.values())
+    }
+}

common/.gitignore

@@ -0,0 +1 @@
+/build

common/build.gradle

@@ -0,0 +1,11 @@
+plugins {
+    id 'java-library'
+}
+
+apply plugin: 'kotlin'
+
+dependencies {
+    // Kotlin
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$versions.kotlin"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$versions.coroutines"
+}

ethree/src/main/java/com/virgilsecurity/ethree/data/exception/Exceptions.kt renamed to common/src/main/java/com/virgilsecurity/android/common/exceptions/Exceptions.kt

@@ -31,7 +31,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.virgilsecurity.ethree.data.exception
+package com.virgilsecurity.android.common.exceptions
 
 /**
  * Created by:

ethree/build.gradle

@@ -9,22 +9,27 @@ apply plugin: 'maven'
 apply plugin: 'org.jetbrains.dokka'
 
 group 'com.virgilsecurity'
-version '0.1.0-aplha'
+version '0.2.0'
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    // Inner dependencies
+    implementation project(':common')
 
     // Virgil
-    compileOnly "com.virgilsecurity.sdk:crypto:${versions.virgilSdk}"
-    implementation "com.virgilsecurity.sdk:crypto-android:${versions.virgilSdk}@aar"
+    compileOnly "com.virgilsecurity.sdk:crypto:$versions.virgilSdk"
+    implementation "com.virgilsecurity.sdk:crypto-android:$versions.virgilSdk@aar"
     implementation "com.virgilsecurity.sdk:sdk:$versions.virgilSdk"
-    implementation ('com.virgilsecurity:pythia:0.2.0') {
+    implementation ("com.virgilsecurity:pythia:$versions.pythia") {
         exclude group: 'com.virgilsecurity.sdk', module: 'crypto'
     }
-    implementation ('com.virgilsecurity:keyknox:0.1.0') {
+    implementation ("com.virgilsecurity:keyknox:$versions.keyknox") {
         exclude group: 'com.virgilsecurity.sdk', module: 'crypto'
     }
 
+    // Kotlin
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$versions.kotlin"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$versions.coroutines"
+
     // Android
     compileOnly "com.google.android:android:$versions.android"
 }
@@ -53,7 +58,7 @@ publishing {
             artifact sourcesJar
             artifact javadocJar
             pom {
-                name = 'Virgil E3Kit Kotlin/Java SDK'
+                name = 'Virgil E3Kit Java/Kotlin SDK'
                 description = 'Virgil Security provides an SDK which symplifies work with Virgil services and presents easy to use API for adding security to any application. In a few simple steps you can setup user encryption with multidevice support.'
                 url = 'https://www.virgilsecurity.com/'
                 licenses {