Fix up command line builds

Except for lesson 3

Author: Jeremy Silver

Lesson01-Favorite-Toys/T01.01-Exercise-CreateLayout/app/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
- compileSdkVersion 24
- buildToolsVersion "24.0.1"
+ compileSdkVersion 25
+ buildToolsVersion "25.0.1"
 
  defaultConfig {
  applicationId "com.android.example.favoritetoys"
  minSdkVersion 10
- targetSdkVersion 24
+ targetSdkVersion 25
  versionCode 1
  versionName "1.0"
  }
@@ -20,7 +20,7 @@ android {
 
 dependencies {
  compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support:appcompat-v7:24.1.1'
+ compile 'com.android.support:appcompat-v7:25.0.1'
 
  // TODO (7) Remove the ConstraintLayout dependency as we aren't using it for these simple projects
  compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha4'

Lesson01-Favorite-Toys/T01.01-Exercise-CreateLayout/build.gradle

@@ -5,7 +5,7 @@ buildscript {
  jcenter()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:2.2.0-beta1'
+ classpath 'com.android.tools.build:gradle:2.3.0-alpha1'
 
  // NOTE: Do not place your application dependencies here; they belong
  // in the individual module build.gradle files

Lesson01-Favorite-Toys/T01.01-Exercise-CreateLayout/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Wed Dec 07 13:56:29 PST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip

Lesson01-Favorite-Toys/T01.01-Exercise-CreateLayout/gradle/wrapper/gradle-wrapper.properties

@@ -1,17 +1,35 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ## Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
  CYGWIN* )
  cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
  MINGW* )
  msys=true
  ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
  MAX_FD_LIMIT=`ulimit -H -n`
  if [ $? -eq 0 ] ; then
  if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
  esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

Lesson01-Favorite-Toys/T01.01-Exercise-CreateLayout/gradlew

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

Lesson01-Favorite-Toys/T01.01-Exercise-CreateLayout/gradlew.bat

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
- compileSdkVersion 24
- buildToolsVersion "24.0.1"
+ compileSdkVersion 25
+ buildToolsVersion "25.0.1"
 
  defaultConfig {
  applicationId "com.android.example.favoritetoys"
  minSdkVersion 10
- targetSdkVersion 24
+ targetSdkVersion 25
  versionCode 1
  versionName "1.0"
  }
@@ -20,7 +20,5 @@ android {
 
 dependencies {
  compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support:appcompat-v7:24.1.1'
-
- // COMPLETED (7) Remove the ConstraintLayout dependency as we aren't using it for these simple projects
+ compile 'com.android.support:appcompat-v7:25.0.1'
 }

Lesson01-Favorite-Toys/T01.01-Solution-CreateLayout/app/build.gradle

@@ -20,9 +20,17 @@
 
 public class MainActivity extends AppCompatActivity {
 
+ // TODO (1) Declare a TextView variable called mToysListTextView
+
  @Override
  protected void onCreate(Bundle savedInstanceState) {
  super.onCreate(savedInstanceState);
  setContentView(R.layout.activity_main);
+
+ // TODO (3) Use findViewById to get a reference to the TextView from the layout
+
+ // TODO (4) Use the static ToyBox.getToyNames method and store the names in a String array
+
+ // TODO (5) Loop through each toy and append the name to the TextView (add \n for spacing)
  }
 }

Lesson01-Favorite-Toys/T01.01-Solution-CreateLayout/app/src/main/java/com/example/android/favoritetoys/MainActivity.java

@@ -18,7 +18,7 @@
 public final class ToyBox {
 
  /**
- * This method returns a list of popular toy names from the 20th and early 21st centuries.
+ * This method returns a list of 100 popular toy names from the 20th and early 21st centuries.
  * I don't know about you guys, but this definitely brings me back to my childhood...
  *
  * @return A list of popular toys

Lesson01-Favorite-Toys/T01.01-Solution-CreateLayout/app/src/main/java/com/example/android/favoritetoys/ToyBox.java

@@ -14,19 +14,14 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<!--COMPLETED (1) Change the ConstraintLayout to a FrameLayout-->
-<!--COMPLETED (6) Remove the line that declares the id, we don't need it-->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_width="match_parent"
  android:layout_height="match_parent">
 
- <!--COMPLETED (2) Remove all attributes with the word constraint in them-->
- <!--COMPLETED (3) Remove the default text-->
- <!--COMPLETED (4) Give the TextView 16dp of padding-->
- <!--COMPLETED (5) Set the text size to 20sp-->
+ <!--TODO (2) Add an id to the TextView with the value @+id/tv_toy_names-->
  <TextView
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:padding="16dp"
  android:textSize="20sp" />
-</FrameLayout>
+</FrameLayout>