From 8c38990fa41d04a86a5b94ae3542aed480324d1a Mon Sep 17 00:00:00 2001 From: AGajowski Date: Wed, 21 Nov 2018 13:42:17 -0500 Subject: [PATCH 1/4] ignore .idea folder --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 250dbff..6f38c10 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ captures/ # Intellij *.iml +**/.idea/ .idea/workspace.xml .idea/tasks.xml .idea/gradle.xml @@ -51,4 +52,4 @@ google-services.json #Freeline freeline.py freeline/ -freeline_project_description.json \ No newline at end of file +freeline_project_description.json From 623ab454c91a597332badbbc6f11b445b483378e Mon Sep 17 00:00:00 2001 From: AGajowski Date: Wed, 21 Nov 2018 13:45:52 -0500 Subject: [PATCH 2/4] remove .idea files --- .../.idea/codeStyleSettings.xml | 228 - NASDK2.0_sample_code/.idea/compiler.xml | 22 - .../.idea/copyright/profiles_settings.xml | 3 - NASDK2.0_sample_code/.idea/encodings.xml | 6 - NASDK2.0_sample_code/.idea/gradle.xml | 19 - .../.idea/libraries/android_android_21.xml | 9 - .../.idea/libraries/android_android_24.xml | 9 - .../libraries/support_annotations_24_0_0.xml | 11 - .../.idea/libraries/support_v4_24_0_0.xml | 13 - NASDK2.0_sample_code/.idea/misc.xml | 46 - NASDK2.0_sample_code/.idea/modules.xml | 10 - .../.idea/runConfigurations.xml | 12 - NASDK2.0_sample_code/.idea/workspace.xml | 3800 ----------------- 13 files changed, 4188 deletions(-) delete mode 100644 NASDK2.0_sample_code/.idea/codeStyleSettings.xml delete mode 100644 NASDK2.0_sample_code/.idea/compiler.xml delete mode 100644 NASDK2.0_sample_code/.idea/copyright/profiles_settings.xml delete mode 100644 NASDK2.0_sample_code/.idea/encodings.xml delete mode 100644 NASDK2.0_sample_code/.idea/gradle.xml delete mode 100644 NASDK2.0_sample_code/.idea/libraries/android_android_21.xml delete mode 100644 NASDK2.0_sample_code/.idea/libraries/android_android_24.xml delete mode 100644 NASDK2.0_sample_code/.idea/libraries/support_annotations_24_0_0.xml delete mode 100644 NASDK2.0_sample_code/.idea/libraries/support_v4_24_0_0.xml delete mode 100644 NASDK2.0_sample_code/.idea/misc.xml delete mode 100644 NASDK2.0_sample_code/.idea/modules.xml delete mode 100644 NASDK2.0_sample_code/.idea/runConfigurations.xml delete mode 100644 NASDK2.0_sample_code/.idea/workspace.xml diff --git a/NASDK2.0_sample_code/.idea/codeStyleSettings.xml b/NASDK2.0_sample_code/.idea/codeStyleSettings.xml deleted file mode 100644 index 719bb8b..0000000 --- a/NASDK2.0_sample_code/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/NASDK2.0_sample_code/.idea/compiler.xml b/NASDK2.0_sample_code/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/NASDK2.0_sample_code/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/NASDK2.0_sample_code/.idea/copyright/profiles_settings.xml b/NASDK2.0_sample_code/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/NASDK2.0_sample_code/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/NASDK2.0_sample_code/.idea/encodings.xml b/NASDK2.0_sample_code/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/NASDK2.0_sample_code/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/NASDK2.0_sample_code/.idea/gradle.xml b/NASDK2.0_sample_code/.idea/gradle.xml deleted file mode 100644 index 33bb120..0000000 --- a/NASDK2.0_sample_code/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/NASDK2.0_sample_code/.idea/libraries/android_android_21.xml b/NASDK2.0_sample_code/.idea/libraries/android_android_21.xml deleted file mode 100644 index 4868873..0000000 --- a/NASDK2.0_sample_code/.idea/libraries/android_android_21.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/NASDK2.0_sample_code/.idea/libraries/android_android_24.xml b/NASDK2.0_sample_code/.idea/libraries/android_android_24.xml deleted file mode 100644 index 80d5c10..0000000 --- a/NASDK2.0_sample_code/.idea/libraries/android_android_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/NASDK2.0_sample_code/.idea/libraries/support_annotations_24_0_0.xml b/NASDK2.0_sample_code/.idea/libraries/support_annotations_24_0_0.xml deleted file mode 100644 index 3f5cec7..0000000 --- a/NASDK2.0_sample_code/.idea/libraries/support_annotations_24_0_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/NASDK2.0_sample_code/.idea/libraries/support_v4_24_0_0.xml b/NASDK2.0_sample_code/.idea/libraries/support_v4_24_0_0.xml deleted file mode 100644 index 6898d3d..0000000 --- a/NASDK2.0_sample_code/.idea/libraries/support_v4_24_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/NASDK2.0_sample_code/.idea/misc.xml b/NASDK2.0_sample_code/.idea/misc.xml deleted file mode 100644 index 5d19981..0000000 --- a/NASDK2.0_sample_code/.idea/misc.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/NASDK2.0_sample_code/.idea/modules.xml b/NASDK2.0_sample_code/.idea/modules.xml deleted file mode 100644 index d561838..0000000 --- a/NASDK2.0_sample_code/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/NASDK2.0_sample_code/.idea/runConfigurations.xml b/NASDK2.0_sample_code/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/NASDK2.0_sample_code/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/NASDK2.0_sample_code/.idea/workspace.xml b/NASDK2.0_sample_code/.idea/workspace.xml deleted file mode 100644 index 33b9175..0000000 --- a/NASDK2.0_sample_code/.idea/workspace.xml +++ /dev/null @@ -1,3800 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1488760464692 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From cc2b6f1ed35d6dd1c43d525626ab1cc5a6b83242 Mon Sep 17 00:00:00 2001 From: AGajowski Date: Wed, 21 Nov 2018 13:49:54 -0500 Subject: [PATCH 3/4] update gradle config --- NASDK2.0_Studio/app/build.gradle | 6 +++--- .../app/src/main/AndroidManifest.xml | 4 ---- .../NASDK_sample_code/build.gradle | 18 +++++++++--------- .../src/main/AndroidManifest.xml | 4 ---- NASDK2.0_sample_code/build.gradle | 10 +++++++++- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/NASDK2.0_Studio/app/build.gradle b/NASDK2.0_Studio/app/build.gradle index 32d7580..e8feecf 100644 --- a/NASDK2.0_Studio/app/build.gradle +++ b/NASDK2.0_Studio/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion '27.0.3' + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { minSdkVersion 16 - targetSdkVersion 26 + targetSdkVersion 28 } buildTypes { diff --git a/NASDK2.0_Studio/app/src/main/AndroidManifest.xml b/NASDK2.0_Studio/app/src/main/AndroidManifest.xml index 8cd91ad..7c17ccc 100644 --- a/NASDK2.0_Studio/app/src/main/AndroidManifest.xml +++ b/NASDK2.0_Studio/app/src/main/AndroidManifest.xml @@ -3,10 +3,6 @@ android:versionCode="5" android:versionName="2.1.3" > - -