From b769994bf17194883d294a8e8429851caa719ba5 Mon Sep 17 00:00:00 2001 From: MatthieuCotton Date: Mon, 5 Dec 2016 16:52:45 +0100 Subject: [PATCH] test --- .idea/.name | 1 - .idea/gradle.xml | 10 +++------- .idea/modules.xml | 2 +- .../java/com/orange/matthieu/soudbox/MainActivity.java | 1 + build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 6 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 .idea/.name diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 800b1cd..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -SoudBox \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 508b3d9..0e23f8e 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,20 +3,16 @@ diff --git a/.idea/modules.xml b/.idea/modules.xml index 35646bf..b15415c 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/java/com/orange/matthieu/soudbox/MainActivity.java b/app/src/main/java/com/orange/matthieu/soudbox/MainActivity.java index 5f7e5d9..55ea670 100644 --- a/app/src/main/java/com/orange/matthieu/soudbox/MainActivity.java +++ b/app/src/main/java/com/orange/matthieu/soudbox/MainActivity.java @@ -23,6 +23,7 @@ protected void onCreate(Bundle savedInstanceState) { Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); initBtn(); + // } @Override diff --git a/build.gradle b/build.gradle index 03bced9..c20bca1 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:2.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 122a0dc..393ff74 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Mon Dec 05 16:51:17 CET 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip