From 2e4240d481bd57f6f3420246426c57f386a04e27 Mon Sep 17 00:00:00 2001 From: amphiaraus Date: Sun, 2 Jun 2019 18:43:44 +0800 Subject: [PATCH 1/2] update gradle version --- .gitignore | 9 +++--- .idea/codeStyles/codeStyleConfig.xml | 5 ++++ .idea/encodings.xml | 4 +++ .idea/gradle.xml | 3 ++ .idea/inspectionProfiles/Project_Default.xml | 10 +++++++ .idea/misc.xml | 30 +++++++++---------- .idea/modules.xml | 3 ++ .idea/vcs.xml | 6 ++++ app/build.gradle | 14 +++------ app/src/main/AndroidManifest.xml | 4 --- build.gradle | 4 ++- fastImageProcessing/build.gradle | 5 ++-- .../incremental/mergeDebugShaders/merger.xml | 2 +- .../compile-file-map.properties | 18 +++++------ .../packageDebugResources/merger.xml | 10 +++---- .../src/main/AndroidManifest.xml | 2 +- .../filter/processing/.gitignore | 1 - gradle/wrapper/gradle-wrapper.properties | 2 +- 18 files changed, 75 insertions(+), 57 deletions(-) create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/vcs.xml delete mode 100644 fastImageProcessing/src/main/resources/project/android/imageprocessing/filter/processing/.gitignore diff --git a/.gitignore b/.gitignore index 39fb081..4d78963 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,8 @@ *.iml .gradle -/local.properties -/.idea/workspace.xml -/.idea/libraries +local.properties +.idea .DS_Store -/build -/captures +build +captures .externalNativeBuild diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..a55e7a1 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index f206233..dd99cd3 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,6 +3,9 @@