Merge pull request #318 from processing/wearapi

merge changes in Services API and permission handling

Author: codeanticode

.gitignore

@@ -11,3 +11,4 @@ release
 
 build/**
 .gradle
+/processing-core.zip

README.md

@@ -1,8 +1,4 @@
 Processing for Android
 ======================
 
-#New architecture branch
-
-This branch is meant to test the new architecture that will allow different app publishing options (fragment-based apps, wallpaper, watchfaces, etc)
-
-It is highly experimental and very likely will break your code, don't use it unless you want to help us with debugging.
+This is the main repository for Processing for Android. It includes the core library inside the core folder, and the mode itself in the root. See the [wiki](https://github.com/processing/processing-android/wiki) for build instructions.

build.gradle

@@ -14,7 +14,7 @@ allprojects {
     apply plugin: 'java'
 
     ext.android_platform = "$sdkdir/platforms/android-$sdkver"
-    ext.core_jar_path = "$rootDir/android-core.zip"
+    ext.core_jar_path = "$rootDir/processing-core.zip"
 
     repositories {
         jcenter()
@@ -66,8 +66,8 @@ task dist {
         Files.copy(file("$buildDir/libs/processing-android.jar").toPath(),
                    file("mode/AndroidMode.jar").toPath(), REPLACE_EXISTING);
 
-        Files.copy(file("core/build/libs/android-core.zip").toPath(),
-                   file("$root/android-core.zip").toPath(), REPLACE_EXISTING);
+        Files.copy(file("core/build/libs/processing-core.zip").toPath(),
+                   file("$root/processing-core.zip").toPath(), REPLACE_EXISTING);
 
         Files.copy(file("mode.properties").toPath(),
                    file("$root/mode.properties").toPath(), REPLACE_EXISTING);

build.xml

@@ -5,7 +5,7 @@
   <!-- path to the main processing repo --> 
   <property name="processing.dir" value="../processing" />
 
-  <property name="core.jar.path" value="android-core.zip" />
+  <property name="core.jar.path" value="processing-core.zip" />
   <property name="mode.jar.path" value="mode/AndroidMode.jar" />
   <property name="mode.dist.path" value="release/AndroidMode.zip" />
   <property name="tools.jar.path" value="mode/tools.jar" />
@@ -58,15 +58,15 @@
 <!--
   <target name="android-dist-check">
 -->
-    <!-- ensure that the android-core.zip file has been built -->
+    <!-- ensure that the processing-core.zip file has been built -->
 <!--
     <available file="${core.jar.path}" 
 	       property="android-core-present" />
 -->
-    <!--<echo message="${target.path}/modes/android/android-core.zip" />-->
+    <!--<echo message="${target.path}/modes/android/processing-core.zip" />-->
 <!--
     <fail unless="android-core-present" 
-	  message="android-core.zip was not built, but is required for dist. Install the Android tools, set ANDROID_SDK, and try again." />
+	  message="processing-core.zip was not built, but is required for dist. Install the Android tools, set ANDROID_SDK, and try again." />
   </target>
 -->
 
@@ -85,7 +85,7 @@
 
     <zip destfile="${mode.dist.path}">
       <zipfileset dir="." prefix="AndroidMode">
-	      <include name="android-core.zip" />
+	      <include name="processing-core.zip" />
         <include name="mode.properties" />	
         <include name="mode/**" />
         <include name="templates/**" />	

core/.classpath

@@ -2,7 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="var" path="ANDROID_LIB"/>
-	<classpathentry kind="lib" path="library/android-support-v4.jar"/>
 	<classpathentry kind="lib" path="library/wearable-2.0.0.jar"/>
+	<classpathentry kind="lib" path="library/support-annotations-25.2.0.jar"/>
+	<classpathentry kind="lib" path="library/support-compat-25.2.0.jar"/>
+	<classpathentry kind="lib" path="library/support-fragment-25.2.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

core/build.gradle

@@ -10,7 +10,9 @@ buildscript {
 
 dependencies {
     compile name: 'android'
-    compile name: 'android-support-v4'
+    compile name: 'support-compat-25.2.0'
+    compile name: 'support-fragment-25.2.0'
+    compile name: 'support-annotations-25.2.0'
     compile name: 'wearable-2.0.0'
 }
 
@@ -46,7 +48,7 @@ task dist {
     doLast {
         // make copy of jar file as zip
         Files.copy(file("$buildDir/libs/core.jar").toPath(),
-                   file("$buildDir/libs/android-core.zip").toPath(), REPLACE_EXISTING);
+                   file("$buildDir/libs/processing-core.zip").toPath(), REPLACE_EXISTING);
 
         // and copy it to root
         Files.copy(file("$buildDir/libs/core.jar").toPath(),

core/build.xml

@@ -7,19 +7,22 @@
   <property name="processing.dir" value="../../processing" />
 
   <!-- path to the core library -->
-  <property name="core.jar.path" value="../android-core.zip" />
+  <property name="core.jar.path" value="../processing-core.zip" />
 
   <!-- Android platform to build the core library -->
   <property name="android.platform" value="android-25" />
 
   <!-- Wear version to build the core library -->
   <property name="wear.version" value="2.0.0" />	
 
+  <!-- Support version to build the core library -->
+  <property name="support.version" value="25.2.0" />	
+	
   <!-- oh ant, you're so cute and convoluted -->
   <target name="build" depends="sdk_chatter,actual_build" />
 
   <target name="sdk_chatter" unless="env.ANDROID_SDK">
-    <echo message="ANDROID_SDK not set, skipping build of android-core.zip" />
+    <echo message="ANDROID_SDK not set, skipping build of processing-core.zip" />
   </target>
 
   <target name="sdk_whining">
@@ -41,7 +44,9 @@
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
 	   bootclasspath="${env.ANDROID_SDK}/platforms/${android.platform}/android.jar;
-    	              library/android-support-v4.jar;
+    	              library/support-compat-${support.version}.jar;
+    	              library/support-fragment-${support.version}.jar;
+    	              library/support-annotations-${support.version}.jar;
 	                  library/wearable-${wear.version}.jar"
 	   srcdir="src" destdir="bin" />