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] 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