Skip to content

Commit 1f9b127

Browse files
authored
Merge pull request #29 from VirgilSecurity/dev
Updated to new crypto, removed coroutines module
2 parents 50f07de + 4943963 commit 1f9b127

File tree

45 files changed

+103
-3411
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+103
-3411
lines changed

build.gradle

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,23 @@
3434
buildscript {
3535
ext.versions = [
3636
// Virgil
37-
virgilSdk : '5.1.1',
38-
virgilCrypto: '0.7.1',
39-
pythia : '0.3.0',
40-
keyknox : '0.2.0',
37+
virgilSdk : '5.1.2',
38+
virgilCrypto: '0.8.0',
39+
pythia : '0.3.1',
40+
keyknox : '0.2.1',
4141

4242
// Kotlin
43-
kotlin : '1.3.31',
43+
kotlin : '1.3.40',
4444
coroutines : '1.3.0-M1',
4545

4646
// Gradle
47-
gardle : '3.4.1',
47+
gardle : '3.4.2',
4848

4949
// Android
5050
android : '4.1.1.4',
5151

5252
// Docs
53-
dokka : '0.9.17',
53+
dokka : '0.9.18',
5454

5555
// Tests
5656
junit : '4.12',
@@ -85,9 +85,8 @@ task clean(type: Delete) {
8585
// Default value is ALL
8686
enum ArtifactType {
8787
ALL,
88-
ALL_WITHOUT_COMMON,
89-
STANDARD,
90-
COROUTINES
88+
COMMON,
89+
STANDARD
9190
}
9291

9392
static String getArtifactType(Project project) {
@@ -116,13 +115,11 @@ task installEthree() {
116115
}
117116

118117
if (artifactType == ArtifactType.STANDARD) {
119-
dependsOn ':ethree-common:publishToMavenLocal', ':ethree-kotlin:publishToMavenLocal'
120-
} else if (artifactType == ArtifactType.COROUTINES) {
121-
dependsOn ':ethree-common:publishToMavenLocal', ':ethree-kotlin-coroutines:publishToMavenLocal'
118+
dependsOn ':ethree-kotlin:publishToMavenLocal'
122119
} else if (artifactType == ArtifactType.ALL) {
123-
dependsOn ':ethree-common:publishToMavenLocal', ':ethree-kotlin:publishToMavenLocal', ':ethree-kotlin-coroutines:publishToMavenLocal'
124-
} else if (artifactType == ArtifactType.ALL_WITHOUT_COMMON) {
125-
dependsOn ':ethree-kotlin:publishToMavenLocal', ':ethree-kotlin-coroutines:publishToMavenLocal'
120+
dependsOn ':ethree-common:publishToMavenLocal', ':ethree-kotlin:publishToMavenLocal'
121+
} else if (artifactType == ArtifactType.COMMON) {
122+
dependsOn ':ethree-common:publishToMavenLocal'
126123
} else {
127124
throw new IllegalArgumentException("Please, choose one of artifacts type: " + ArtifactType.values())
128125
}
@@ -138,13 +135,11 @@ task publishEthree() {
138135
}
139136

140137
if (artifactType == ArtifactType.STANDARD) {
141-
dependsOn ':ethree-common:publish', ':ethree-kotlin:publish'
142-
} else if (artifactType == ArtifactType.COROUTINES) {
143-
dependsOn ':ethree-common:publish', ':ethree-kotlin-coroutines:publish'
138+
dependsOn ':ethree-kotlin:publish'
144139
} else if (artifactType == ArtifactType.ALL) {
145-
dependsOn ':ethree-common:publish', ':ethree-kotlin:publish', ':ethree-kotlin-coroutines:publish'
146-
} else if (artifactType == ArtifactType.ALL_WITHOUT_COMMON) {
147-
dependsOn ':ethree-kotlin:publish', ':ethree-kotlin-coroutines:publish'
140+
dependsOn ':ethree-common:publish', ':ethree-kotlin:publish'
141+
} else if (artifactType == ArtifactType.COMMON) {
142+
dependsOn ':ethree-common:publish'
148143
} else {
149144
throw new IllegalArgumentException("Please, choose one of artifacts type: " + ArtifactType.values())
150145
}

ethree-kotlin-coroutines/.gitignore

Lines changed: 0 additions & 175 deletions
This file was deleted.

ethree-kotlin-coroutines/README.md

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)