Finish fixing up 4.10

udacity · Nov 7, 2016 · 4609e70 · 4609e70
1 parent 7ae90e9
commit 4609e70
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 19 deletions.
diff --git a/4.10-Exercise-SetUpUnitTesting/.gitignore b/4.10-Exercise-SetUpUnitTesting/.gitignore
@@ -1,6 +1,5 @@
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
+/.idea
 .DS_Store
 /build
diff --git a/4.10-Exercise-SetUpUnitTesting/app/build.gradle b/4.10-Exercise-SetUpUnitTesting/app/build.gradle
@@ -9,25 +9,23 @@ Exercises:
 
 To complete the latter task, check out:
 
-    https://developer.android.com/training/activity-testing/activity-ui-testing.html
+    https://developer.android.com/training/testing/ui-testing/espresso-testing.html
 
 */
 
-
-
-
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    compileSdkVersion 25
+    buildToolsVersion "24.0.3"
 
     defaultConfig {
         applicationId "com.example.android.clickcounter"
         minSdkVersion 15
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -39,5 +37,9 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:24.1.1'
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    compile 'com.android.support:appcompat-v7:25.0.0'
+    testCompile 'junit:junit:4.12'
 }
diff --git a/4.10-Exercise-SetUpUnitTesting/app/src/main/res/layout-land/activity_click.xml b/4.10-Exercise-SetUpUnitTesting/app/src/main/res/layout-land/activity_click.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="horizontal"
-    android:baselineAligned="false">
+    android:baselineAligned="false"
+    android:orientation="horizontal">
 
     <fragment
         android:id="@+id/left_container"

diff --git a/4.10-Exercise-SetUpUnitTesting/app/src/main/res/layout/fragment_click.xml b/4.10-Exercise-SetUpUnitTesting/app/src/main/res/layout/fragment_click.xml
@@ -28,6 +28,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+
             android:text="@string/click_button_message" />
     </FrameLayout>
 

diff --git a/4.10-Exercise-SetUpUnitTesting/build.gradle b/4.10-Exercise-SetUpUnitTesting/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0-beta1'
+        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/4.10-Exercise-SetUpUnitTesting/gradle/wrapper/gradle-wrapper.jar b/4.10-Exercise-SetUpUnitTesting/gradle/wrapper/gradle-wrapper.jar
diff --git a/4.10-Exercise-SetUpUnitTesting/gradle/wrapper/gradle-wrapper.properties b/4.10-Exercise-SetUpUnitTesting/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 17 11:05:56 PDT 2016
+#Mon Nov 07 10:54:36 PST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
diff --git a/4.10-Exercise-SetUpUnitTesting/solution/build.gradle b/4.10-Exercise-SetUpUnitTesting/solution/build.gradle
@@ -1,4 +1,8 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+/*
+
+Check out the build.gradle file in the app directory.
+
+*/
 
 buildscript {
     repositories {

diff --git a/4.10-Exercise-SetUpUnitTesting/solution/gradle/wrapper/gradle-wrapper.jar b/4.10-Exercise-SetUpUnitTesting/solution/gradle/wrapper/gradle-wrapper.jar
diff --git a/4.10-Exercise-SetUpUnitTesting/solution/gradle/wrapper/gradle-wrapper.properties b/4.10-Exercise-SetUpUnitTesting/solution/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 17 11:10:30 PDT 2016
+#Mon Nov 07 10:54:38 PST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip