branch develop updated (74400b3 -> 9113977)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wlo. See http://git.codelutin.com/wlo.git from 74400b3 [jgitflow-maven-plugin]updating poms for 1.2-SNAPSHOT development new 9113977 fixes #6364 Corrections pour la mise à jour automatique de l'application The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 9113977c2deb48d903731ce7f6bb2ed79a6c6a94 Author: Kevin Morin <morin@codelutin.com> Date: Tue Dec 23 16:12:38 2014 +0100 fixes #6364 Corrections pour la mise à jour automatique de l'application Summary of changes: AndroidManifest.xml | 4 +-- pom.xml | 30 +++------------------- .../java/fr/ifremer/wlo/utils/UpdateCheckTask.java | 2 +- 3 files changed, 6 insertions(+), 30 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wlo. See http://git.codelutin.com/wlo.git commit 9113977c2deb48d903731ce7f6bb2ed79a6c6a94 Author: Kevin Morin <morin@codelutin.com> Date: Tue Dec 23 16:12:38 2014 +0100 fixes #6364 Corrections pour la mise à jour automatique de l'application --- AndroidManifest.xml | 4 +-- pom.xml | 30 +++------------------- .../java/fr/ifremer/wlo/utils/UpdateCheckTask.java | 2 +- 3 files changed, 6 insertions(+), 30 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f1f0d9b..e8dec7d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -15,8 +15,8 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="fr.ifremer.wlo" - android:versionCode="7" - android:versionName="1.0"> + android:versionCode="8" + android:versionName="1.1.1"> <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="15"/> diff --git a/pom.xml b/pom.xml index 9cbd21b..5bc1f32 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wlo</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <name>WLO</name> <description> @@ -253,7 +253,6 @@ </pluginRepositories> <build> - <!--<sourceDirectory>src</sourceDirectory>--> <resources> <resource> <directory>res</directory> @@ -287,7 +286,6 @@ <excludeJarResources> <excludeJarResource>.*nuiton.*</excludeJarResource> </excludeJarResources> - <!--<device>emulator</device>--> <device>usb</device> <zipalign> <verbose>true</verbose> @@ -303,28 +301,6 @@ <extensions>true</extensions> </plugin> - <!-- plugin site --> - <!--<plugin>--> - <!--<artifactId>maven-site-plugin</artifactId>--> - <!--<dependencies>--> - <!--<dependency>--> - <!--<groupId>org.nuiton.jrst</groupId>--> - <!--<artifactId>doxia-module-jrst</artifactId>--> - <!--<version>${jrstPluginVersion}</version>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>hsqldb</groupId>--> - <!--<artifactId>hsqldb</artifactId>--> - <!--<version>${jdbc.hsqldb.version}</version>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>org.hibernate</groupId>--> - <!--<artifactId>hibernate-core</artifactId>--> - <!--<version>${hibernateVersion}</version>--> - <!--</dependency>--> - <!--</dependencies>--> - <!--</plugin>--> - </plugins> </build> @@ -609,12 +585,12 @@ <goal>upload-single</goal> </goals> <configuration> - <serverId>doc.codelutin.com</serverId> + <serverId>wlo.codelutin.com</serverId> <fromFile> ${project.build.directory}/update/wlo-update.properties </fromFile> <url> - scpexe://doc.codelutin.com/var/www/ApplicationUpdate/http/wlo + scpexe://wlo.codelutin.com/var/www/ApplicationUpdate/http/wlo </url> </configuration> </execution> diff --git a/src/main/java/fr/ifremer/wlo/utils/UpdateCheckTask.java b/src/main/java/fr/ifremer/wlo/utils/UpdateCheckTask.java index 8edf0ee..fa50c3a 100644 --- a/src/main/java/fr/ifremer/wlo/utils/UpdateCheckTask.java +++ b/src/main/java/fr/ifremer/wlo/utils/UpdateCheckTask.java @@ -52,7 +52,7 @@ public class UpdateCheckTask extends AsyncTask<String, Integer, String> { private static final String TAG = "UpdateCheckTask"; - public static final String UPDATE_URL = "http://appup.nuiton.org/wlo/wlo-update.properties"; + public static final String UPDATE_URL = "http://wlo.codelutin.com/update/wlo-update.properties"; public static final String VERSION_PROP = "application.version"; public static final String URL_PROP = "application.url"; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm