Google Git
Sign in
android / platform / developers / samples / android / 57690c2^! / .
commit57690c21113d5dff8b89b1fb76a5ac94bdbbefab[log] [tgz]
authorTrevor Johns <trevorjohns@google.com>Wed Aug 19 15:15:38 2015 -0700
committerTrevor Johns <trevorjohns@google.com>Wed Aug 19 15:18:56 2015 -0700
treeb8e07fc06f30281bf8b7a763c622151051bb935a
parent7440180d7868fca9b43641377004e9953d057910 [diff]
Swap compileSdkVersion for targetSdkVersion

Amendment to commit dee2a470f2. This is a more compatible version
of that chagne, in that it doesn't require users download an
obsolete version of the SDK.

Change-Id: Ib9da586888b089246a85a5379edacb0bdf2a90eb

diff --git a/admin/NfcProvisioning/template-params.xml b/admin/NfcProvisioning/template-params.xml
index 0edb4a4..1152cae 100644
--- a/admin/NfcProvisioning/template-params.xml
+++ b/admin/NfcProvisioning/template-params.xml

@@ -20,7 +20,7 @@
     <package>com.example.android.nfcprovisioning</package>
 
     <minSdk>21</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <strings>
         <intro>

diff --git a/content/contacts/BasicContactables/template-params.xml b/content/contacts/BasicContactables/template-params.xml
index 8b29357..3b5245c 100644
--- a/content/contacts/BasicContactables/template-params.xml
+++ b/content/contacts/BasicContactables/template-params.xml

@@ -21,7 +21,7 @@
 
     <!-- change minSdk if needed-->
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <strings>
         <intro>

diff --git a/content/documentsUi/StorageProvider/template-params.xml b/content/documentsUi/StorageProvider/template-params.xml
index 415e5f3..d0eaeef 100644
--- a/content/documentsUi/StorageProvider/template-params.xml
+++ b/content/documentsUi/StorageProvider/template-params.xml

@@ -22,7 +22,7 @@
 
     <!-- change minSdk if needed-->
     <minSdk>19</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <strings>
         <intro>

diff --git a/media/Camera2Basic/template-params.xml b/media/Camera2Basic/template-params.xml
index 09e4986..9841830 100644
--- a/media/Camera2Basic/template-params.xml
+++ b/media/Camera2Basic/template-params.xml

@@ -22,7 +22,7 @@
     <group>Media</group>
     <package>com.example.android.camera2basic</package>
     <minSdk>21</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
     <strings>
         <intro>
             <![CDATA[

diff --git a/media/Camera2Raw/template-params.xml b/media/Camera2Raw/template-params.xml
index c44de7d..18a0a7f 100644
--- a/media/Camera2Raw/template-params.xml
+++ b/media/Camera2Raw/template-params.xml

@@ -20,7 +20,7 @@
     <group>Media</group>
     <package>com.example.android.camera2raw</package>
     <minSdk>21</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
     <strings>
         <intro>
             <![CDATA[

diff --git a/media/Camera2Video/template-params.xml b/media/Camera2Video/template-params.xml
index d981b18..9a5d8c4 100644
--- a/media/Camera2Video/template-params.xml
+++ b/media/Camera2Video/template-params.xml

@@ -21,7 +21,7 @@
     <package>com.example.android.camera2video</package>
 
     <minSdk>21</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <strings>
         <intro>

diff --git a/media/MediaRecorder/template-params.xml b/media/MediaRecorder/template-params.xml
index bf1fbce..e79c506 100644
--- a/media/MediaRecorder/template-params.xml
+++ b/media/MediaRecorder/template-params.xml

@@ -19,7 +19,7 @@
     <group>Media</group>
     <package>com.example.android.mediarecorder</package>
     <minSdk>16</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
     <strings>
         <intro>
 <![CDATA[

diff --git a/notification/LNotifications/template-params.xml b/notification/LNotifications/template-params.xml
index 3b490fa..9d327a4 100644
--- a/notification/LNotifications/template-params.xml
+++ b/notification/LNotifications/template-params.xml

@@ -22,7 +22,7 @@
 
     <!-- change minSdk if needed-->
     <minSdk>21</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <strings>
         <intro>

diff --git a/ui/graphics/DisplayingBitmaps/template-params.xml b/ui/graphics/DisplayingBitmaps/template-params.xml
index 59fc132..643e049 100644
--- a/ui/graphics/DisplayingBitmaps/template-params.xml
+++ b/ui/graphics/DisplayingBitmaps/template-params.xml

@@ -21,7 +21,7 @@
 
     <!-- change minSdk if needed-->
     <minSdk>9</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <strings>
         <intro>

diff --git a/wearable/wear/AgendaData/template-params.xml b/wearable/wear/AgendaData/template-params.xml
index a6d47ac..3331da2 100644
--- a/wearable/wear/AgendaData/template-params.xml
+++ b/wearable/wear/AgendaData/template-params.xml

@@ -23,7 +23,7 @@
     <package>com.example.android.wearable.agendadata</package>
 
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <wearable>
         <has_handheld_app>true</has_handheld_app>

diff --git a/wearable/wear/DataLayer/template-params.xml b/wearable/wear/DataLayer/template-params.xml
index 5c509d8..f40b9d6 100644
--- a/wearable/wear/DataLayer/template-params.xml
+++ b/wearable/wear/DataLayer/template-params.xml

@@ -20,7 +20,7 @@
     <package>com.example.android.wearable.datalayer</package>
 
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <wearable>
         <has_handheld_app>true</has_handheld_app>

diff --git a/wearable/wear/DelayedConfirmation/template-params.xml b/wearable/wear/DelayedConfirmation/template-params.xml
index 92adec0..5f77d65 100644
--- a/wearable/wear/DelayedConfirmation/template-params.xml
+++ b/wearable/wear/DelayedConfirmation/template-params.xml

@@ -23,7 +23,7 @@
     <package>com.example.android.wearable.delayedconfirmation</package>
 
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <wearable>
         <has_handheld_app>true</has_handheld_app>

diff --git a/wearable/wear/ElizaChat/template-params.xml b/wearable/wear/ElizaChat/template-params.xml
index 063963f..ea26b5c 100644
--- a/wearable/wear/ElizaChat/template-params.xml
+++ b/wearable/wear/ElizaChat/template-params.xml

@@ -23,7 +23,7 @@
     <package>com.example.android.wearable.elizachat</package>
 
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <strings>
         <intro>

diff --git a/wearable/wear/EmbeddedApp/template-params.xml b/wearable/wear/EmbeddedApp/template-params.xml
index a14ca55..13186e5 100644
--- a/wearable/wear/EmbeddedApp/template-params.xml
+++ b/wearable/wear/EmbeddedApp/template-params.xml

@@ -23,7 +23,7 @@
     <package>com.example.android.wearable.embeddedapp</package>
 
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <wearable>
         <has_handheld_app>true</has_handheld_app>

diff --git a/wearable/wear/FindMyPhone/template-params.xml b/wearable/wear/FindMyPhone/template-params.xml
index 3db7e1c..e8d71c6 100644
--- a/wearable/wear/FindMyPhone/template-params.xml
+++ b/wearable/wear/FindMyPhone/template-params.xml

@@ -23,7 +23,7 @@
     <package>com.example.android.wearable.findphone</package>
 
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <wearable>
         <has_handheld_app>true</has_handheld_app>

diff --git a/wearable/wear/Flashlight/template-params.xml b/wearable/wear/Flashlight/template-params.xml
index 7844842..e1ec869 100644
--- a/wearable/wear/Flashlight/template-params.xml
+++ b/wearable/wear/Flashlight/template-params.xml

@@ -24,7 +24,7 @@
 
     <!-- change minSdk if needed-->
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <strings>
         <intro>

diff --git a/wearable/wear/Geofencing/template-params.xml b/wearable/wear/Geofencing/template-params.xml
index 1479a63..00fd3b3 100644
--- a/wearable/wear/Geofencing/template-params.xml
+++ b/wearable/wear/Geofencing/template-params.xml

@@ -23,7 +23,7 @@
     <package>com.example.android.wearable.geofencing</package>
 
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <dependency>com.google.android.gms:play-services-location:7.3.0</dependency>
 

diff --git a/wearable/wear/GridViewPager/template-params.xml b/wearable/wear/GridViewPager/template-params.xml
index 4aa8cec..f6dc567 100644
--- a/wearable/wear/GridViewPager/template-params.xml
+++ b/wearable/wear/GridViewPager/template-params.xml

@@ -23,7 +23,7 @@
     <package>com.example.android.wearable.gridviewpager</package>
 
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <strings>
         <intro>

diff --git a/wearable/wear/JumpingJack/template-params.xml b/wearable/wear/JumpingJack/template-params.xml
index a5b2f3b..692a6a5 100644
--- a/wearable/wear/JumpingJack/template-params.xml
+++ b/wearable/wear/JumpingJack/template-params.xml

@@ -23,7 +23,7 @@
     <package>com.example.android.wearable.jumpingjack</package>
 
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <strings>
         <intro>

diff --git a/wearable/wear/Notifications/template-params.xml b/wearable/wear/Notifications/template-params.xml
index 5822cc4..c4936ea 100644
--- a/wearable/wear/Notifications/template-params.xml
+++ b/wearable/wear/Notifications/template-params.xml

@@ -23,7 +23,7 @@
     <package>com.example.android.support.wearable.notifications</package>
 
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <wearable>
         <has_handheld_app>true</has_handheld_app>

diff --git a/wearable/wear/Quiz/template-params.xml b/wearable/wear/Quiz/template-params.xml
index 850e7af..297bf19 100644
--- a/wearable/wear/Quiz/template-params.xml
+++ b/wearable/wear/Quiz/template-params.xml

@@ -23,7 +23,7 @@
     <package>com.example.android.wearable.quiz</package>
 
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <wearable>
         <has_handheld_app>true</has_handheld_app>

diff --git a/wearable/wear/RecipeAssistant/template-params.xml b/wearable/wear/RecipeAssistant/template-params.xml
index 7adca31..943b368 100644
--- a/wearable/wear/RecipeAssistant/template-params.xml
+++ b/wearable/wear/RecipeAssistant/template-params.xml

@@ -23,7 +23,7 @@
     <package>com.example.android.wearable.recipeassistant</package>
 
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <strings>
         <intro>

diff --git a/wearable/wear/SkeletonWearableApp/template-params.xml b/wearable/wear/SkeletonWearableApp/template-params.xml
index c636fd0..b0f4b36 100644
--- a/wearable/wear/SkeletonWearableApp/template-params.xml
+++ b/wearable/wear/SkeletonWearableApp/template-params.xml

@@ -20,7 +20,7 @@
     <package>com.example.android.google.wearable.app</package>
 
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <strings>
         <intro>

diff --git a/wearable/wear/SpeedTracker/template-params.xml b/wearable/wear/SpeedTracker/template-params.xml
index c1ac141..1cf3161 100644
--- a/wearable/wear/SpeedTracker/template-params.xml
+++ b/wearable/wear/SpeedTracker/template-params.xml

@@ -23,7 +23,7 @@
     <package>com.example.android.wearable.speedtracker</package>
 
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <wearable>
         <has_handheld_app>true</has_handheld_app>

diff --git a/wearable/wear/SynchronizedNotifications/template-params.xml b/wearable/wear/SynchronizedNotifications/template-params.xml
index f9b9cc0..799b226 100644
--- a/wearable/wear/SynchronizedNotifications/template-params.xml
+++ b/wearable/wear/SynchronizedNotifications/template-params.xml

@@ -23,7 +23,7 @@
     <package>com.example.android.wearable.synchronizednotifications</package>
 
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <wearable>
         <has_handheld_app>true</has_handheld_app>

diff --git a/wearable/wear/Timer/template-params.xml b/wearable/wear/Timer/template-params.xml
index 8d2434b..1188402 100644
--- a/wearable/wear/Timer/template-params.xml
+++ b/wearable/wear/Timer/template-params.xml

@@ -23,7 +23,7 @@
     <package>com.example.android.wearable.timer</package>
 
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <strings>
         <intro>

diff --git a/wearable/wear/WatchFace/template-params.xml b/wearable/wear/WatchFace/template-params.xml
index 293b754..cedf8db 100644
--- a/wearable/wear/WatchFace/template-params.xml
+++ b/wearable/wear/WatchFace/template-params.xml

@@ -23,7 +23,7 @@
     <package>com.example.android.wearable.watchface</package>
 
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <dependency_wearable>com.android.support:palette-v7:21.0.0</dependency_wearable>
     <dependency>com.google.android.support:wearable:1.3.0</dependency>

diff --git a/wearable/wear/WatchViewStub/template-params.xml b/wearable/wear/WatchViewStub/template-params.xml
index 40073b5..ff7e7f8 100644
--- a/wearable/wear/WatchViewStub/template-params.xml
+++ b/wearable/wear/WatchViewStub/template-params.xml

@@ -20,7 +20,7 @@
     <package>com.example.android.google.wearable.watchviewstub</package>
 
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <strings>
         <intro>

diff --git a/wearable/wear/XYZTouristAttractions/template-params.xml b/wearable/wear/XYZTouristAttractions/template-params.xml
index 09dfbd2..cfa368f 100644
--- a/wearable/wear/XYZTouristAttractions/template-params.xml
+++ b/wearable/wear/XYZTouristAttractions/template-params.xml

@@ -19,7 +19,7 @@
     <group>Wearable</group>
     <package>com.example.android.xyztouristattractions</package>
     <minSdk>18</minSdk>
-    <compileSdkVersion>22</compileSdkVersion>
+    <targetSdkVersion>22</targetSdkVersion>
 
     <wearable>
         <has_handheld_app>true</has_handheld_app>