Update Samples

Ademar Alves de Oliveira · Ademar Alves de Oliveira · commit 661a2c152579 · 2017-07-01T14:20:01.000-05:00
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

Original file line number	Diff line number	Diff line change
`@@ -2,16 +2,16 @@ apply plugin: 'com.android.application'`
`2`	`2`
`3`	`3`	`android {`
`4`	`4`
`5`		`- compileSdkVersion 24`
`6`		`- buildToolsVersion '24.0.3'`
	`5`	`+ compileSdkVersion 25`
	`6`	`+ buildToolsVersion '25.0.3'`
`7`	`7`
`8`	`8`	`defaultConfig {`
`9`	`9`	`minSdkVersion 1`
`10`		`- targetSdkVersion 24`
	`10`	`+ targetSdkVersion 25`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`dependencies {`
`16`		`- compile 'com.github.simbiose:Encryption:2.0.0'`
	`16`	`+ compile 'com.github.simbiose:Encryption:2.0.1'`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ buildscript {`
`3`	`3`	`jcenter()`
`4`	`4`	`}`
`5`	`5`	`dependencies {`
`6`		`- classpath 'com.android.tools.build:gradle:2.2.2'`
	`6`	`+ classpath 'com.android.tools.build:gradle:2.3.3'`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,17 @@`
`1`		`-apply plugin: 'java'`
`2`	`1`	`apply plugin: 'kotlin'`
	`2`	`+apply plugin: 'application'`
	`3`	`+`
	`4`	`+mainClassName = 'se.simbio.encryption.MainKt'`
`3`	`5`
`4`	`6`	`group 'se.simbio.encryption.kotlin.example'`
`5`		`-version '2.0.0'`
	`7`	`+version '2.0.1'`
`6`	`8`
`7`	`9`	`buildscript {`
`8`	`10`	`repositories {`
`9`	`11`	`mavenCentral()`
`10`	`12`	`}`
`11`	`13`	`dependencies {`
`12`		`- classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.4'`
	`14`	`+ classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.3'`
`13`	`15`	`}`
`14`	`16`	`}`
`15`	`17`
`@@ -21,14 +23,10 @@ repositories {`
`21`	`23`	`}`
`22`	`24`
`23`	`25`	`sourceSets {`
`24`		`- main {`
`25`		`- java {`
`26`		`- srcDir 'src'`
`27`		`- }`
`28`		`- }`
	`26`	`+ main.kotlin.srcDirs += 'src'`
`29`	`27`	`}`
`30`	`28`
`31`	`29`	`dependencies {`
`32`		`- compile 'com.github.simbiose:Encryption:2.0.0'`
`33`		`- compile 'org.jetbrains.kotlin:kotlin-stdlib:1.0.4'`
	`30`	`+ implementation 'com.github.simbiose:Encryption:2.0.1'`
	`31`	`+ implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.1.3'`
`34`	`32`	`}`