Merge pull request #33 from VirgilSecurity/dev

Merge v3.0.0 into master branch

.gitignore

@@ -5,6 +5,7 @@ local.properties
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 .idea
+*.iml
 
 # User-specific stuff
 .idea/**/workspace.xml
@@ -96,4 +97,5 @@ gradle-app.setting
 # Project-specific
 testsDev.sh
 testsStg.sh
-testsProd.sh
+testsProd.sh
+env.json

.travis.yml

@@ -1,10 +1,16 @@
 language: java
-
+services:
+  - docker
+jdk:
+  - oraclejdk9
 os:
   - linux
-  - osx
 
-branches:
-  only:
-    - dev
-    - master
+before_install:
+  - openssl aes-256-cbc -K $encrypted_e2b216a86c03_key -iv $encrypted_e2b216a86c03_iv -in env.json.enc -out env.json -d
+
+script:
+  - pushd purekit/src/test/resources/com/virgilsecurity/purekit
+  - ./setuptestdb.sh
+  - popd
+  - "./gradlew clean test"

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2015-2019 Virgil Security Inc.
+Copyright (C) 2015-2020 Virgil Security Inc.
 
 All rights reserved.
 

build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Virgil Security, Inc.
+ * Copyright (c) 2015-2020, Virgil Security, Inc.
  *
  * Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
  *
@@ -34,41 +34,39 @@
 buildscript {
     ext.versions = [
             // Virgil
-            virgilCrypto  : '0.8.0',
-
-            // Http client
-            fuel          : '2.1.0',
-
-            // Kotlin
-            kotlin        : '1.3.41',
-            coroutines    : '1.3.0-M2',
+            virgilCrypto   : '0.12.2',
+            sdk            : '7.1.0',
 
             // Protobuf
-            protobuf      : '3.6.1',
+            protobufVersion: '3.9.1',
 
-            // Docs
-            dokka         : '0.9.18',
+            // Gson
+            gson           : '2.8.5',
 
             // Tests
-            junit         : '5.5.0',
-            junitPlugin   : '1.2.0',
+            junit          : '5.5.0',
 
     ]
     repositories {
         jcenter()
         mavenCentral()
+        mavenLocal()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
-        classpath "org.junit.platform:junit-platform-gradle-plugin:$versions.junitPlugin"
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$versions.dokka"
     }
 }
 
 allprojects {
+    group "com.virgilsecurity"
+    version "3.0.0"
+
     repositories {
+        maven {
+            url 'https://oss.sonatype.org/content/repositories/snapshots'
+        }
         jcenter()
         mavenCentral()
+        mavenLocal()
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

purekit-protos/build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Virgil Security, Inc.
+ * Copyright (c) 2015-2020, Virgil Security, Inc.
  *
  * Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
  *
@@ -31,32 +31,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-buildscript {
-    ext.versions = [
-            dokkaVersion: '0.9.17',
-    ]
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$versions.dokkaVersion"
-    }
-}
-
 plugins {
     id 'java'
     id 'java-library'
     id 'maven-publish'
     id 'signing'
 }
 
-apply from: "$rootDir/meta.gradle"
-
-group "com.virgilsecurity"
-version "0.1.0"
-
 apply plugin: 'maven'
-apply plugin: 'org.jetbrains.dokka'
 
 sourceCompatibility = 1.8
 
@@ -68,15 +50,15 @@ repositories {
 
 dependencies {
     // Protobuf
-    compile "com.google.protobuf:protobuf-java:$versions.protobuf"
+    compile "com.google.protobuf:protobuf-java:$versions.protobufVersion"
 }
 
 task sourcesJar(type: Jar) {
     from(sourceSets["main"].allSource)
     classifier = 'sources'
 }
 
-task javadocJar(type: Jar, dependsOn: 'dokka') {
+task javadocJar(type: Jar) {
     from "$buildDir/javadoc"
     classifier = 'javadoc'
 }
@@ -98,7 +80,7 @@ publishing {
                 licenses {
                     license {
                         name = 'Virgil Security, Inc. license'
-                        url = 'https://github.com/virgilsecurity/virgil-purekit-kotlin/blob/master/LICENSE.txt'
+                        url = 'https://github.com/virgilsecurity/virgil-purekit-java/blob/master/LICENSE.txt'
                     }
                 }
                 developers {
@@ -110,9 +92,9 @@ publishing {
                     }
                 }
                 scm {
-                    connection = 'scm:git:https://github.com/virgilsecurity/virgil-purekit-kotlin.git'
-                    developerConnection = 'scm:git:git@github.com:virgilsecurity/virgil-purekit-kotlin.git'
-                    url = 'https://github.com/virgilsecurity/virgil-purekit-kotlin'
+                    connection = 'scm:git:https://github.com/virgilsecurity/virgil-purekit-java.git'
+                    developerConnection = 'scm:git:git@github.com:virgilsecurity/virgil-purekit-java.git'
+                    url = 'https://github.com/virgilsecurity/virgil-purekit-java'
                 }
             }
         }
@@ -133,9 +115,3 @@ publishing {
 signing {
     sign publishing.publications.mavenJava
 }
-
-dokka {
-    outputFormat = 'html'
-    outputDirectory = "$buildDir/javadoc"
-    reportUndocumented = false
-}

purekit-protos/src/main/java/com/virgilsecurity/purekit/protobuf/build/PurekitProtos.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Virgil Security, Inc.
+ * Copyright (c) 2015-2020, Virgil Security, Inc.
  *
  * Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
  *