From 5869bde5b77ac12a67fd029e685a5cc3c9aeae8f Mon Sep 17 00:00:00 2001 From: TacticalTwerking Date: Fri, 14 Oct 2016 10:46:11 +0800 Subject: [PATCH] Build upgrade --- .gitignore | 10 +- .idea/.name | 1 - .idea/compiler.xml | 23 ---- .idea/encodings.xml | 5 - .idea/gradle.xml | 19 ---- .idea/misc.xml | 138 +++++++---------------- .idea/modules.xml | 3 +- .idea/scopes/scope_settings.xml | 5 - .idea/vcs.xml | 3 +- app/app.iml | 86 ++++++++------ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- org.thecongers.mtpms.iml | 8 +- 13 files changed, 113 insertions(+), 194 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/scopes/scope_settings.xml diff --git a/.gitignore b/.gitignore index 26f9544..9a7509b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,11 @@ /import-summary.txt .gradle /local.properties -/.idea/workspace.xml -/.idea/libraries +/.idea/ .DS_Store -/build +/build/* +/app/build/ +/.idea/* + + +/.gradle/ diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 08357f6..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -org.thecongers.mtpms \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 217af47..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index e206d70..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index fe865d3..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 856a07f..852cb91 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,10 +1,28 @@ - - - - - + + + @@ -16,96 +34,26 @@ - + - - - - - - - - - - - - - - - - - - - - - - - localhost - 5050 - + + + + + + + 1.8 + + + + + + - - + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 0d14bb3..40377b3 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -6,5 +6,4 @@ - - + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b..0000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index c80f219..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -3,5 +3,4 @@ - - + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index 9be5538..fa1ef59 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,5 +1,5 @@ - + @@ -12,9 +12,9 @@ - + @@ -32,14 +32,16 @@ + - - - - - - - + + + + + + + + @@ -47,6 +49,15 @@ + + + + + + + + + @@ -54,6 +65,7 @@ + @@ -61,34 +73,44 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + - - - + + + + + - - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index e26cdee..305dc05 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c71e76..3b3ae8e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Fri Oct 14 10:36:20 CST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip diff --git a/org.thecongers.mtpms.iml b/org.thecongers.mtpms.iml index 0bb6048..c034d3e 100644 --- a/org.thecongers.mtpms.iml +++ b/org.thecongers.mtpms.iml @@ -1,13 +1,14 @@ - + - + @@ -15,5 +16,4 @@ - - + \ No newline at end of file