Auto-update

googlearchive · May 21, 2015 · d4689ee · d4689ee
1 parent b85d8ac
commit d4689ee
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 2 deletions.
diff --git a/.google/packaging.yaml b/.google/packaging.yaml
@@ -1,3 +1,4 @@
+
 # GOOGLE SAMPLE PACKAGING DATA
 #
 # This file is used by Google as part of our samples packaging process.

diff --git a/Application/build.gradle b/Application/build.gradle
@@ -1,10 +1,11 @@
+
 buildscript {
     repositories {
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.1.0'
     }
 }
 
@@ -15,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    compile "com.android.support:cardview-v7:21.0.2"
+    compile 'com.android.support:cardview-v7:21.0.2'
 }
 
 // The sample build uses multiple directories to
@@ -35,6 +36,11 @@ android {
         targetSdkVersion 21
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
     sourceSets {
         main {
             dirs.each { dir ->

diff --git a/Application/src/main/res/values-v21/base-colors.xml b/Application/src/main/res/values-v21/base-colors.xml
@@ -14,6 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
+
 <resources>
 
 

diff --git a/Application/src/main/res/values-v21/base-template-styles.xml b/Application/src/main/res/values-v21/base-template-styles.xml
@@ -14,6 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
+
 <resources>
 
     <!-- Activity themes -->

diff --git a/Application/src/main/res/values/base-strings.xml b/Application/src/main/res/values/base-strings.xml
@@ -14,6 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
+
 <resources>
     <string name="app_name">CardView Sample</string>
     <string name="intro_message">

diff --git a/NOTICE b/NOTICE
@@ -1,3 +1,4 @@
+
 This sample uses the following software:
 
 Copyright 2015 The Android Open Source Project

diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
+
 Android CardView Sample Sample
 ===================================
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ @@
      See the License for the specific language governing permissions and
      limitations under the License.
     -->
     <resources>
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@

		This sample uses the following software:

		Copyright 2015 The Android Open Source Project
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@

		Android CardView Sample Sample
		===================================

Expand Down