sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1805588 - in /sis/branches/Android: ./ core/ core/sis-utility/src/main/ core/sis-utility/src/main/java/org/apache/sis/internal/system/ core/sis-utility/src/test/java/org/apache/sis/test/
Date Sun, 20 Aug 2017 23:34:05 GMT
Author: desruisseaux
Date: Sun Aug 20 23:34:04 2017
New Revision: 1805588

URL: http://svn.apache.org/viewvc?rev=1805588&view=rev
Log:
Merge part of Sisinda work on Android branch.

Added:
    sis/branches/Android/core/sis-utility/src/main/AndroidManifest.xml   (with props)
Removed:
    sis/branches/Android/core/sis-utility/src/main/java/org/apache/sis/internal/system/OSGiActivator.java
    sis/branches/Android/core/sis-utility/src/main/java/org/apache/sis/internal/system/ServletListener.java
Modified:
    sis/branches/Android/core/pom.xml
    sis/branches/Android/core/sis-utility/src/main/java/org/apache/sis/internal/system/SystemListener.java
    sis/branches/Android/core/sis-utility/src/test/java/org/apache/sis/test/TestConfiguration.java
    sis/branches/Android/pom.xml

Modified: sis/branches/Android/core/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/core/pom.xml?rev=1805588&r1=1805587&r2=1805588&view=diff
==============================================================================
--- sis/branches/Android/core/pom.xml (original)
+++ sis/branches/Android/core/pom.xml Sun Aug 20 23:34:04 2017
@@ -182,6 +182,7 @@
     <dependency>
       <groupId>com.google.android</groupId>
       <artifactId>android-test</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.android</groupId>

Added: sis/branches/Android/core/sis-utility/src/main/AndroidManifest.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/core/sis-utility/src/main/AndroidManifest.xml?rev=1805588&view=auto
==============================================================================
--- sis/branches/Android/core/sis-utility/src/main/AndroidManifest.xml (added)
+++ sis/branches/Android/core/sis-utility/src/main/AndroidManifest.xml Sun Aug 20 23:34:04
2017
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="org.apache.sis.utility"
+          android:versionCode="1"
+          android:versionName="0.8-android-SNAPSHOT">
+    <uses-sdk android:minSdkVersion="26" />
+</manifest>

Propchange: sis/branches/Android/core/sis-utility/src/main/AndroidManifest.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/Android/core/sis-utility/src/main/AndroidManifest.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: sis/branches/Android/core/sis-utility/src/main/java/org/apache/sis/internal/system/SystemListener.java
URL: http://svn.apache.org/viewvc/sis/branches/Android/core/sis-utility/src/main/java/org/apache/sis/internal/system/SystemListener.java?rev=1805588&r1=1805587&r2=1805588&view=diff
==============================================================================
--- sis/branches/Android/core/sis-utility/src/main/java/org/apache/sis/internal/system/SystemListener.java
[UTF-8] (original)
+++ sis/branches/Android/core/sis-utility/src/main/java/org/apache/sis/internal/system/SystemListener.java
[UTF-8] Sun Aug 20 23:34:04 2017
@@ -94,7 +94,6 @@ public abstract class SystemListener imp
 
     /**
      * Removes all listeners for the module of the given name.
-     * This method is invoked by {@link OSGiActivator}.
      *
      * @param  name  the name of the module for which to remove listeners, or {@code null}
if the module
      *         to uninstall does not have symbolic name (in which case it is probably not
a SIS module).

Modified: sis/branches/Android/core/sis-utility/src/test/java/org/apache/sis/test/TestConfiguration.java
URL: http://svn.apache.org/viewvc/sis/branches/Android/core/sis-utility/src/test/java/org/apache/sis/test/TestConfiguration.java?rev=1805588&r1=1805587&r2=1805588&view=diff
==============================================================================
--- sis/branches/Android/core/sis-utility/src/test/java/org/apache/sis/test/TestConfiguration.java
[UTF-8] (original)
+++ sis/branches/Android/core/sis-utility/src/test/java/org/apache/sis/test/TestConfiguration.java
[UTF-8] Sun Aug 20 23:34:04 2017
@@ -64,6 +64,6 @@ public final strictfp class TestConfigur
      * @return {@code true} if tests that may depend on garbage collector activity are allowed.
      */
     public static boolean allowGarbageCollectorDependentTests() {
-        return true;
+        return false;
     }
 }

Modified: sis/branches/Android/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/pom.xml?rev=1805588&r1=1805587&r2=1805588&view=diff
==============================================================================
--- sis/branches/Android/pom.xml (original)
+++ sis/branches/Android/pom.xml Sun Aug 20 23:34:04 2017
@@ -1006,6 +1006,7 @@ Apache SIS is a free software, Java lang
   </repositories>
 
 
+
   <!-- ==============================================================
          Group of modules to build in approximate dependency order.
        ============================================================== -->



Mime
View raw message