Update Samples

simbiose · Jul 1, 2017 · 661a2c1 · 661a2c1
1 parent 258e4ec
commit 661a2c1
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 26 deletions.
diff --git a/Examples/Android/app/build.gradle b/Examples/Android/app/build.gradle
@@ -2,16 +2,16 @@ apply plugin: 'com.android.application'
 
 android {
 
-    compileSdkVersion 24
-    buildToolsVersion '24.0.3'
+    compileSdkVersion 25
+    buildToolsVersion '25.0.3'
 
     defaultConfig {
         minSdkVersion 1
-        targetSdkVersion 24
+        targetSdkVersion 25
     }
 
 }
 
 dependencies {
-    compile 'com.github.simbiose:Encryption:2.0.0'
+    compile 'com.github.simbiose:Encryption:2.0.1'
 }
diff --git a/Examples/Android/app/src/main/AndroidManifest.xml b/Examples/Android/app/src/main/AndroidManifest.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     package="se.simbio.encryption"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        tools:ignore="GoogleAppIndexingWarning">
+        android:label="@string/app_name">
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name">

diff --git a/Examples/Android/build.gradle b/Examples/Android/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 

diff --git a/Examples/Android/gradle/wrapper/gradle-wrapper.jar b/Examples/Android/gradle/wrapper/gradle-wrapper.jar
diff --git a/Examples/Android/gradle/wrapper/gradle-wrapper.properties b/Examples/Android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
diff --git a/Examples/Java/build.gradle b/Examples/Java/build.gradle
@@ -1,7 +1,10 @@
 apply plugin: 'java'
+apply plugin: 'application'
+
+mainClassName = 'se.simbio.encryption.Main'
 
 group 'se.simbio.encryption.java.example'
-version '2.0.0'
+version '2.0.1'
 
 repositories {
     mavenCentral()
@@ -19,5 +22,5 @@ sourceSets {
 }
 
 dependencies {
-    compile 'com.github.simbiose:Encryption:2.0.0'
+    implementation 'com.github.simbiose:Encryption:2.0.1'
 }
diff --git a/Examples/Java/gradle/wrapper/gradle-wrapper.jar b/Examples/Java/gradle/wrapper/gradle-wrapper.jar
diff --git a/Examples/Java/gradle/wrapper/gradle-wrapper.properties b/Examples/Java/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
diff --git a/Examples/Kotlin/build.gradle b/Examples/Kotlin/build.gradle
@@ -1,15 +1,17 @@
-apply plugin: 'java'
 apply plugin: 'kotlin'
+apply plugin: 'application'
+
+mainClassName = 'se.simbio.encryption.MainKt'
 
 group 'se.simbio.encryption.kotlin.example'
-version '2.0.0'
+version '2.0.1'
 
 buildscript {
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.4'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.3'
     }
 }
 
@@ -21,14 +23,10 @@ repositories {
 }
 
 sourceSets {
-    main {
-        java {
-            srcDir 'src'
-        }
-    }
+    main.kotlin.srcDirs += 'src'
 }
 
 dependencies {
-    compile 'com.github.simbiose:Encryption:2.0.0'
-    compile 'org.jetbrains.kotlin:kotlin-stdlib:1.0.4'
+    implementation 'com.github.simbiose:Encryption:2.0.1'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.1.3'
 }
diff --git a/Examples/Kotlin/gradle/wrapper/gradle-wrapper.jar b/Examples/Kotlin/gradle/wrapper/gradle-wrapper.jar
diff --git a/Examples/Kotlin/gradle/wrapper/gradle-wrapper.properties b/Examples/Kotlin/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
diff --git a/Examples/Kotlin/src/se/simbio/encryption/Examples.kt b/Examples/Kotlin/src/se/simbio/encryption/Examples.kt
@@ -1,8 +1,7 @@
 package se.simbio.encryption
 
-import java.security.NoSuchAlgorithmException
-
 import third.part.android.util.Base64
+import java.security.NoSuchAlgorithmException
 
 /**
  * each method is an example of Encryption