Merge pull request #23 from OWASP/runOnAndroid28

Run on android 28
OWASP · May 14, 2020 · cf0b207 · cf0b207
2 parents 9b454e4 + a2dad06
commit cf0b207
Show file tree

Hide file tree

Showing 14 changed files with 258 additions and 60 deletions.
diff --git a/Android/MSTG-Android-Java-App/.idea/caches/build_file_checksums.ser b/Android/MSTG-Android-Java-App/.idea/caches/build_file_checksums.ser
diff --git a/Android/MSTG-Android-Java-App/.idea/codeStyles/Project.xml b/Android/MSTG-Android-Java-App/.idea/codeStyles/Project.xml
diff --git a/Android/MSTG-Android-Java-App/.idea/gradle.xml b/Android/MSTG-Android-Java-App/.idea/gradle.xml
diff --git a/Android/MSTG-Android-Java-App/.idea/misc.xml b/Android/MSTG-Android-Java-App/.idea/misc.xml
diff --git a/Android/MSTG-Android-Java-App/.idea/modules.xml b/Android/MSTG-Android-Java-App/.idea/modules.xml
diff --git a/Android/MSTG-Android-Java-App/.idea/vcs.xml b/Android/MSTG-Android-Java-App/.idea/vcs.xml
diff --git a/Android/MSTG-Android-Java-App/app/build.gradle b/Android/MSTG-Android-Java-App/app/build.gradle
@@ -31,7 +31,7 @@ apply plugin: 'com.android.application'
         defaultConfig {
             applicationId "sg.vp.owasp_mobile.omtg_android"
             minSdkVersion 21
-            targetSdkVersion 26
+            targetSdkVersion 28
             versionCode 1
             versionName "1.0"
         }
@@ -98,8 +98,8 @@ apply plugin: 'com.android.application'
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.android.support:design:23.1.1'
+    compile 'com.android.support:appcompat-v7:26.1.0'
+    compile 'com.android.support:design:26.1.0'
     compile files('libs/sqlcipher.jar')
     compile files('libs/guava-r09.jar')
     compile files('libs/commons-codec.jar')

diff --git a/Android/MSTG-Android-Java-App/build.gradle b/Android/MSTG-Android-Java-App/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.6.3'
 //            classpath 'com.android.tools.build:gradle-experimental:0.11.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -16,6 +16,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 

diff --git a/Android/MSTG-Android-Java-App/gradle/wrapper/gradle-wrapper.properties b/Android/MSTG-Android-Java-App/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Wed Aug 15 15:03:08 SGT 2018
+#Tue May 12 23:29:02 CEST 2020
 proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/Android/MSTG-Android-Kotlin-App/.idea/caches/build_file_checksums.ser b/Android/MSTG-Android-Kotlin-App/.idea/caches/build_file_checksums.ser