Skip to content

Commit

Permalink
Updated to new crypto, removed coroutines module
Browse files Browse the repository at this point in the history
  • Loading branch information
BuddahLD committed Jul 12, 2019
1 parent 433a992 commit c0c366b
Show file tree
Hide file tree
Showing 44 changed files with 102 additions and 3,410 deletions.
39 changes: 17 additions & 22 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,23 @@
buildscript {
ext.versions = [
// Virgil
virgilSdk : '5.1.1',
virgilCrypto: '0.7.1',
pythia : '0.3.0',
keyknox : '0.2.0',
virgilSdk : '5.1.2',
virgilCrypto: '0.8.0',
pythia : '0.3.1',
keyknox : '0.2.1',

// Kotlin
kotlin : '1.3.31',
kotlin : '1.3.40',
coroutines : '1.3.0-M1',

// Gradle
gardle : '3.4.1',
gardle : '3.4.2',

// Android
android : '4.1.1.4',

// Docs
dokka : '0.9.17',
dokka : '0.9.18',

// Tests
junit : '4.12',
Expand Down Expand Up @@ -85,9 +85,8 @@ task clean(type: Delete) {
// Default value is ALL
enum ArtifactType {
ALL,
ALL_WITHOUT_COMMON,
STANDARD,
COROUTINES
COMMON,
STANDARD
}

static String getArtifactType(Project project) {
Expand Down Expand Up @@ -116,13 +115,11 @@ task installEthree() {
}

if (artifactType == ArtifactType.STANDARD) {
dependsOn ':ethree-common:publishToMavenLocal', ':ethree-kotlin:publishToMavenLocal'
} else if (artifactType == ArtifactType.COROUTINES) {
dependsOn ':ethree-common:publishToMavenLocal', ':ethree-kotlin-coroutines:publishToMavenLocal'
dependsOn ':ethree-kotlin:publishToMavenLocal'
} else if (artifactType == ArtifactType.ALL) {
dependsOn ':ethree-common:publishToMavenLocal', ':ethree-kotlin:publishToMavenLocal', ':ethree-kotlin-coroutines:publishToMavenLocal'
} else if (artifactType == ArtifactType.ALL_WITHOUT_COMMON) {
dependsOn ':ethree-kotlin:publishToMavenLocal', ':ethree-kotlin-coroutines:publishToMavenLocal'
dependsOn ':ethree-common:publishToMavenLocal', ':ethree-kotlin:publishToMavenLocal'
} else if (artifactType == ArtifactType.COMMON) {
dependsOn ':ethree-common:publishToMavenLocal'
} else {
throw new IllegalArgumentException("Please, choose one of artifacts type: " + ArtifactType.values())
}
Expand All @@ -138,13 +135,11 @@ task publishEthree() {
}

if (artifactType == ArtifactType.STANDARD) {
dependsOn ':ethree-common:publish', ':ethree-kotlin:publish'
} else if (artifactType == ArtifactType.COROUTINES) {
dependsOn ':ethree-common:publish', ':ethree-kotlin-coroutines:publish'
dependsOn ':ethree-kotlin:publish'
} else if (artifactType == ArtifactType.ALL) {
dependsOn ':ethree-common:publish', ':ethree-kotlin:publish', ':ethree-kotlin-coroutines:publish'
} else if (artifactType == ArtifactType.ALL_WITHOUT_COMMON) {
dependsOn ':ethree-kotlin:publish', ':ethree-kotlin-coroutines:publish'
dependsOn ':ethree-common:publish', ':ethree-kotlin:publish'
} else if (artifactType == ArtifactType.COMMON) {
dependsOn ':ethree-common:publish'
} else {
throw new IllegalArgumentException("Please, choose one of artifacts type: " + ArtifactType.values())
}
Expand Down
175 changes: 0 additions & 175 deletions ethree-kotlin-coroutines/.gitignore

This file was deleted.

59 changes: 0 additions & 59 deletions ethree-kotlin-coroutines/README.md

This file was deleted.

Loading

0 comments on commit c0c366b

Please sign in to comment.