From 8ef4339412ec326898ffd60ca51d42e04c9ac16b Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Fri, 18 Mar 2016 02:57:38 +0100
Subject: [PATCH 1/2] README format fix
---
README.md | 51 ++++++++++++++++++++++++++-------------------------
1 file changed, 26 insertions(+), 25 deletions(-)
diff --git a/README.md b/README.md
index f5d5a43..8eb95dd 100644
--- a/README.md
+++ b/README.md
@@ -6,29 +6,30 @@ The goal of this library is to offer a little abstraction layer for Nrz (Loïc B
This is used in owncloud-SMS app
- * Copyright (c) 2013-2015, Loic Blot <loic.blot@unix-experience.fr>
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those
- * of the authors and should not be interpreted as representing official policies,
- * either expressed or implied, of the FreeBSD Project.
+```
+Copyright (c) 2013-2015, Loic Blot <loic.blot@unix-experience.fr>
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies,
+either expressed or implied, of the FreeBSD Project.
+```
From 690c42138c990ed2127e224e030150b4e353dde7 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Fri, 18 Mar 2016 03:20:23 +0100
Subject: [PATCH 2/2] Build using apache maven
---
.gitignore | 1 +
build.xml | 29 --------------
pom.xml | 38 +++++++++++++++++++
src/main/AndroidManifest.xml | 11 ++++++
.../activities/NrzSettingsActivity.java | 0
.../adapters/AndroidAccountAdapter.java | 0
.../fr/nrz/androidlib/common/SharedPrefs.java | 0
.../notifications/NrzNotification.java | 0
8 files changed, 50 insertions(+), 29 deletions(-)
create mode 100644 .gitignore
delete mode 100644 build.xml
create mode 100644 pom.xml
create mode 100644 src/main/AndroidManifest.xml
rename src/{ => main/java}/fr/nrz/androidlib/activities/NrzSettingsActivity.java (100%)
rename src/{ => main/java}/fr/nrz/androidlib/adapters/AndroidAccountAdapter.java (100%)
rename src/{ => main/java}/fr/nrz/androidlib/common/SharedPrefs.java (100%)
rename src/{ => main/java}/fr/nrz/androidlib/notifications/NrzNotification.java (100%)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2f7896d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/build.xml b/build.xml
deleted file mode 100644
index f6c8a06..0000000
--- a/build.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<project name="nrz-androidlib" default="dist" basedir=".">
- <property name="dist.dir" location="dist" />
- <property name="src" location="src"/>
- <property name="build.dir" location="build"/>
- <property file="androidsdk.properties" />
-
- <path id="res.classpath">
- <fileset dir="${androidsdk.path}" includes="**/*.jar" />
- </path>
-
- <target name="init">
- <mkdir dir="${build.dir}" />
- <mkdir dir="${dist.dir}" />
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="${src}" destdir="${build.dir}" classpathref="res.classpath" includeantruntime="false" />
- </target>
-
- <target name="dist" depends="compile">
- <jar destfile="${dist.dir}/nrz-androidlib.jar" basedir="${build.dir}">
- </jar>
- </target>
-
- <target name="clean">
- <delete dir="${build.dir}" />
- <delete dir="${dist.dir}" />
- </target>
-</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..2c41cd6
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>fr.nrz.androidlib</groupId>
+ <artifactId>gs-maven-android</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <properties>
+ <!-- use UTF-8 for everything -->
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.google.android</groupId>
+ <artifactId>android</artifactId>
+ <version>4.1.1.4</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..6778f18
--- /dev/null
+++ b/src/main/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="fr.nrz.androidlib"
+ android:versionCode="1"
+ android:versionName="1.0">
+
+ <uses-sdk
+ android:minSdkVersion="8"
+ android:targetSdkVersion="23"/>
+
+</manifest>
diff --git a/src/fr/nrz/androidlib/activities/NrzSettingsActivity.java b/src/main/java/fr/nrz/androidlib/activities/NrzSettingsActivity.java
similarity index 100%
rename from src/fr/nrz/androidlib/activities/NrzSettingsActivity.java
rename to src/main/java/fr/nrz/androidlib/activities/NrzSettingsActivity.java
diff --git a/src/fr/nrz/androidlib/adapters/AndroidAccountAdapter.java b/src/main/java/fr/nrz/androidlib/adapters/AndroidAccountAdapter.java
similarity index 100%
rename from src/fr/nrz/androidlib/adapters/AndroidAccountAdapter.java
rename to src/main/java/fr/nrz/androidlib/adapters/AndroidAccountAdapter.java
diff --git a/src/fr/nrz/androidlib/common/SharedPrefs.java b/src/main/java/fr/nrz/androidlib/common/SharedPrefs.java
similarity index 100%
rename from src/fr/nrz/androidlib/common/SharedPrefs.java
rename to src/main/java/fr/nrz/androidlib/common/SharedPrefs.java
diff --git a/src/fr/nrz/androidlib/notifications/NrzNotification.java b/src/main/java/fr/nrz/androidlib/notifications/NrzNotification.java
similarity index 100%
rename from src/fr/nrz/androidlib/notifications/NrzNotification.java
rename to src/main/java/fr/nrz/androidlib/notifications/NrzNotification.java