From f0f8401adcefa668aec22b86a8ad3a16010c8602 Mon Sep 17 00:00:00 2001 From: Wonyoung Date: Fri, 9 Dec 2016 15:27:51 +0900 Subject: [PATCH] no need for constraint layout --- .idea/modules.xml | 3 +++ app/build.gradle | 2 +- app/src/main/res/layout/activity_main.xml | 15 +++++++++++++-- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.idea/modules.xml b/.idea/modules.xml index b22b7b7..77ac88b 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,8 +3,11 @@ + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 16fc99c..120f04c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,7 +25,7 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) compile 'com.android.support:appcompat-v7:23.4.0' - compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha3' +// compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha9' testCompile 'junit:junit:4.12' compile project(':papershredderlib') } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4205db0..880f558 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -15,14 +15,25 @@ + android:layout_height="220dp" + paper:sherderType="0"/> + + - /> diff --git a/build.gradle b/build.gradle index d94539c..74b2ab0 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-alpha5' + classpath 'com.android.tools.build:gradle:2.2.3' // 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..417d2ab 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 +#Fri Dec 09 14:47:26 KST 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