From a2dad06e2812f7c26399bca47773769c20e0e5d3 Mon Sep 17 00:00:00 2001 From: Jeroen Willemsen Date: Tue, 12 May 2020 23:43:11 +0200 Subject: [PATCH] Run on android 28 --- .../.idea/caches/build_file_checksums.ser | Bin 534 -> 535 bytes .../.idea/codeStyles/Project.xml | 134 ++++++++++++++---- .../MSTG-Android-Java-App/.idea/gradle.xml | 2 + Android/MSTG-Android-Java-App/.idea/misc.xml | 21 ++- .../MSTG-Android-Java-App/.idea/modules.xml | 2 + Android/MSTG-Android-Java-App/.idea/vcs.xml | 2 +- .../MSTG-Android-Java-App/app/build.gradle | 6 +- Android/MSTG-Android-Java-App/build.gradle | 3 +- .../gradle/wrapper/gradle-wrapper.properties | 4 +- .../.idea/caches/build_file_checksums.ser | Bin 542 -> 535 bytes .../.idea/codeStyles/Project.xml | 134 ++++++++++++++---- .../MSTG-Android-Kotlin-App/.idea/gradle.xml | 2 + .../MSTG-Android-Kotlin-App/.idea/modules.xml | 2 + Android/MSTG-Android-Kotlin-App/.idea/vcs.xml | 6 + 14 files changed, 258 insertions(+), 60 deletions(-) create mode 100644 Android/MSTG-Android-Kotlin-App/.idea/vcs.xml 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 index 9b9a486d4571dcc11e506ef06bd3c293984c72a6..b9639881dfb31349f9b84253107f8363f034669f 100644 GIT binary patch delta 111 zcmV-#0FeKd1eXMmmj!YP)(t+9oSzUK!H+lvgG#4J{0a;Ntp<{ljR74Wckg2s3@YO! z{i@qGKY}P>bO0tVRdZ!>b1!mXdT(-*Spg&v)E$i3j{vd+>3|8C?D#@{lez&*5s=nU Rtj)I=%t1tiS~OJb@pwV6Eo}e* delta 117 zcmV-*0E+*Y1eOGlmjz{16fawmoSz;!totb?TEfiZ@yG4hctkIB03|O~b7gXKFLQQf zZj*-rBoJbl`EB(wBFv%EWtwH>3R{y)0UZ-+>j6VP4=GC$2KejzhXD|D01=ar0UMLq X0WA^umi7B%ZQh-fjfEnAm^zYpV#G25 diff --git a/Android/MSTG-Android-Java-App/.idea/codeStyles/Project.xml b/Android/MSTG-Android-Java-App/.idea/codeStyles/Project.xml index 30aa626..ae78c11 100644 --- a/Android/MSTG-Android-Java-App/.idea/codeStyles/Project.xml +++ b/Android/MSTG-Android-Java-App/.idea/codeStyles/Project.xml @@ -1,29 +1,113 @@ - - - - - - - - - - + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + \ No newline at end of file diff --git a/Android/MSTG-Android-Java-App/.idea/gradle.xml b/Android/MSTG-Android-Java-App/.idea/gradle.xml index 195e217..d872885 100644 --- a/Android/MSTG-Android-Java-App/.idea/gradle.xml +++ b/Android/MSTG-Android-Java-App/.idea/gradle.xml @@ -1,8 +1,10 @@ + - + diff --git a/Android/MSTG-Android-Java-App/.idea/modules.xml b/Android/MSTG-Android-Java-App/.idea/modules.xml index 979a2ff..30d320d 100644 --- a/Android/MSTG-Android-Java-App/.idea/modules.xml +++ b/Android/MSTG-Android-Java-App/.idea/modules.xml @@ -2,6 +2,8 @@ + + diff --git a/Android/MSTG-Android-Java-App/.idea/vcs.xml b/Android/MSTG-Android-Java-App/.idea/vcs.xml index 6564d52..b2bdec2 100644 --- a/Android/MSTG-Android-Java-App/.idea/vcs.xml +++ b/Android/MSTG-Android-Java-App/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Android/MSTG-Android-Java-App/app/build.gradle b/Android/MSTG-Android-Java-App/app/build.gradle index e6fe99f..d85ab49 100644 --- 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 index 457a79a..ab3e153 100644 --- 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 index 91c2df9..09e0307 100644 --- 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 index 1e027b676d39a7e6691bf04dded5d084c77545f1..b16b4f8567fd725a2f8bdf22c9dd41d0eb870568 100755 GIT binary patch delta 214 zcmbQoGM#0@bk-uS9mPK;&haxS@5*`COBmGjLyJ?3iuH>UtMZHVq4wxQtef1xC_4E*qn_QC-ZAG@q*g E0Ik?oqW}N^ delta 214 zcmbQvGLL1#bk?MzmvOfy&hbwdNGvFbNh;0ENzqF$N=(T~EiGbTigsG_S^NhZN5}&v z28N0P1_lO!Jq{<+?{v@#i>QbG2y9sPMLY$`FZIvP)lMaPhj*E+$ZqoK#6}wt@qZ9&cen; GK@|XyI#Qkh diff --git a/Android/MSTG-Android-Kotlin-App/.idea/codeStyles/Project.xml b/Android/MSTG-Android-Kotlin-App/.idea/codeStyles/Project.xml index 30aa626..ae78c11 100755 --- a/Android/MSTG-Android-Kotlin-App/.idea/codeStyles/Project.xml +++ b/Android/MSTG-Android-Kotlin-App/.idea/codeStyles/Project.xml @@ -1,29 +1,113 @@ - - - - - - - - - - + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + \ No newline at end of file diff --git a/Android/MSTG-Android-Kotlin-App/.idea/gradle.xml b/Android/MSTG-Android-Kotlin-App/.idea/gradle.xml index 7ac24c7..5cd135a 100755 --- a/Android/MSTG-Android-Kotlin-App/.idea/gradle.xml +++ b/Android/MSTG-Android-Kotlin-App/.idea/gradle.xml @@ -1,8 +1,10 @@ +