sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1677898 - in /sis/branches/Android: application/pom.xml application/sis-android/pom.xml application/sis-android/src/main/java/org/apache/sis/Main.java application/sis-webapp/ pom.xml
Date Tue, 05 May 2015 22:15:04 GMT
Author: desruisseaux
Date: Tue May  5 22:15:03 2015
New Revision: 1677898

URL: http://svn.apache.org/r1677898
Log:
Partial configuration for Android (not yet working, but closer).

Removed:
    sis/branches/Android/application/sis-webapp/
Modified:
    sis/branches/Android/application/pom.xml
    sis/branches/Android/application/sis-android/pom.xml
    sis/branches/Android/application/sis-android/src/main/java/org/apache/sis/Main.java
    sis/branches/Android/pom.xml

Modified: sis/branches/Android/application/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/application/pom.xml?rev=1677898&r1=1677897&r2=1677898&view=diff
==============================================================================
--- sis/branches/Android/application/pom.xml (original)
+++ sis/branches/Android/application/pom.xml Tue May  5 22:15:03 2015
@@ -114,7 +114,7 @@
            Sub-modules included in the build in dependency order
        =========================================================== -->
   <modules>
-    <module>sis-webapp</module>
+    <!-- module>sis-android</module -->
     <module>sis-console</module>
   </modules>
 

Modified: sis/branches/Android/application/sis-android/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/application/sis-android/pom.xml?rev=1677898&r1=1677897&r2=1677898&view=diff
==============================================================================
--- sis/branches/Android/application/sis-android/pom.xml (original)
+++ sis/branches/Android/application/sis-android/pom.xml Tue May  5 22:15:03 2015
@@ -71,8 +71,6 @@
     <dependency>
       <groupId>com.google.android</groupId>
       <artifactId>android</artifactId>
-      <version>4.1.1.4</version>
-      <scope>provided</scope>
     </dependency>
   </dependencies>
 

Modified: sis/branches/Android/application/sis-android/src/main/java/org/apache/sis/Main.java
URL: http://svn.apache.org/viewvc/sis/branches/Android/application/sis-android/src/main/java/org/apache/sis/Main.java?rev=1677898&r1=1677897&r2=1677898&view=diff
==============================================================================
--- sis/branches/Android/application/sis-android/src/main/java/org/apache/sis/Main.java [UTF-8]
(original)
+++ sis/branches/Android/application/sis-android/src/main/java/org/apache/sis/Main.java [UTF-8]
Tue May  5 22:15:03 2015
@@ -38,6 +38,6 @@ public class Main extends Activity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 		Log.i(TAG, "onCreate");
-        setContentView(R.layout.main);
+//      setContentView(R.layout.main);
     }
 }

Modified: sis/branches/Android/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/pom.xml?rev=1677898&r1=1677897&r2=1677898&view=diff
==============================================================================
--- sis/branches/Android/pom.xml (original)
+++ sis/branches/Android/pom.xml Tue May  5 22:15:03 2015
@@ -316,6 +316,13 @@ Apache SIS is a free software, Java lang
        ============================================================== -->
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>com.google.android</groupId>
+        <artifactId>android</artifactId>
+        <version>4.1.1.4</version>
+        <scope>provided</scope>
+      </dependency>
+
       <!-- Import all dependency management used by the GeAPI project.
            This include JUnit and units of measurement. -->
       <dependency>
@@ -476,6 +483,19 @@ Apache SIS is a free software, Java lang
        ============================================================== -->
   <build>
     <plugins>
+      <plugin>
+        <groupId>com.simpligility.maven.plugins</groupId>
+        <artifactId>android-maven-plugin</artifactId>
+        <version>4.2.0</version>
+        <configuration>
+          <sdk>
+            <platform>2.1</platform>
+          </sdk>
+          <deleteconflictingfiles>true</deleteconflictingfiles>
+          <undeploybeforedeploy>true</undeploybeforedeploy>
+        </configuration>
+        <extensions>true</extensions>
+      </plugin>
 
       <!-- Compile -->
       <plugin>



Mime
View raw message