mirror of
https://github.com/nextcloud/android.git
synced 2024-11-21 12:45:32 +03:00
#1320 remove maven build capabilities
This commit is contained in:
Andy Scherzinger
parent
ca3b1e8e7d
commit
4b89423f4c
6 changed files with 4 additions and 179 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -37,7 +37,4 @@ tests/proguard-project.txt
|
|||
.gradle
|
||||
.idea
|
||||
*.iml
|
||||
build
|
||||
|
||||
# Actionbarsherlock is now ignored since scripts takes care of init the sub-modules.
|
||||
actionbarsherlock
|
||||
build
|
||||
|
|
@ -6,8 +6,6 @@ android:
|
|||
- android-23
|
||||
- android-22
|
||||
- android-19
|
||||
before_install:
|
||||
- rm pom.xml
|
||||
script:
|
||||
- ./setup_env.sh ant
|
||||
- ant clean
|
||||
|
|
|
|||
23
SETUP.md
23
SETUP.md
|
|
@ -131,29 +131,6 @@ The generated APK file is saved in android/build/outputs/apk as android-debug.ap
|
|||
The resulting APKs will be saved in the 'bin/' subdirectory of the project.
|
||||
|
||||
|
||||
### 6. Building in command line with maven:
|
||||
|
||||
** Currently these build instructions DO NOT WORK. There is no estimation time to fix it. Unless some volunteer contributor fixes this build option, and given that Maven is a minority option in Android environments, we will probably remove this option.
|
||||
|
||||
NOTE: You must have mvn (version >= 3.1.1) in your environment path. Current Android 'platforms-tools' need to be installed.
|
||||
|
||||
Download/install Android plugin for Maven, then build ownCloud with mvn:
|
||||
|
||||
* Resolve necessary dependencies running:
|
||||
- Windows: "setup_env.bat maven"
|
||||
- Mac OS/Linux: "./setup_env.sh maven"
|
||||
* cd ..
|
||||
* git clone https://github.com/mosabua/maven-android-sdk-deployer.git
|
||||
* cd maven-android-sdk-deployer
|
||||
* mvn -pl com.simpligility.android.sdk-deployer:android-22 -am install
|
||||
* mvn -pl com.simpligility.android.sdk-deployer:android-23 -am install
|
||||
* cd ../android/owncloud-android-library
|
||||
* mvn install
|
||||
* cd ..
|
||||
|
||||
Now you can create ownCloud APK using "mvn package" and find it as ownCloud.apk under the target
|
||||
|
||||
|
||||
[0]: https://github.com/owncloud/android/blob/master/CONTRIBUTING.md
|
||||
[1]: https://git-scm.com/
|
||||
[2]: https://git-scm.com/downloads
|
||||
|
|
|
|||
138
pom.xml
138
pom.xml
|
|
@ -1,138 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
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>com.owncloud.android</groupId>
|
||||
<artifactId>owncloud</artifactId>
|
||||
<version>${owncloud.version}</version>
|
||||
<packaging>apk</packaging>
|
||||
<name>Owncloud Android</name>
|
||||
|
||||
<properties>
|
||||
<owncloud.version>1.5.1-SNAPSHOT</owncloud.version>
|
||||
<java-version>1.6</java-version>
|
||||
<!-- Given by maven-android-sdk-deployer -->
|
||||
<google.android-version>4.4.2_r4</google.android-version>
|
||||
<!-- Usually the latest Android API -->
|
||||
<google.android-api>19</google.android-api>
|
||||
<actionbarsherlock-version>4.2.0</actionbarsherlock-version>
|
||||
</properties>
|
||||
|
||||
<url>https://github.com/owncloud/android</url>
|
||||
<description>Owncloud for Android</description>
|
||||
<scm>
|
||||
<connection>scm:git:git@github.com:owncloud/android.git</connection>
|
||||
<developerConnection>scm:git:git@github.com:owncloud/android.git</developerConnection>
|
||||
<url>https://github.com/owncloud/android</url>
|
||||
</scm>
|
||||
|
||||
|
||||
<!--<repositories>-->
|
||||
<!--<repository>-->
|
||||
<!--<id>android-support</id>-->
|
||||
<!--<url>file://${env.ANDROID_HOME}/extras/android/m2repository</url>-->
|
||||
<!--</repository>-->
|
||||
<!--</repositories>-->
|
||||
|
||||
<dependencies>
|
||||
|
||||
<!-- Dirty trick, but it works. TouchImageView library is not available as Maven project. -->
|
||||
<dependency>
|
||||
<groupId>touch-image-view.jar</groupId>
|
||||
<artifactId>touch-image-view.jar</artifactId>
|
||||
<version>1.0</version>
|
||||
<scope>system</scope>
|
||||
<systemPath>${basedir}/libs/touch-image-view.jar</systemPath>
|
||||
</dependency>
|
||||
|
||||
<!-- This causes a (version?) conflict during packaging since sherlockactionbar also includes compatibility-v4 -->
|
||||
<!--<dependency>
|
||||
<groupId>android.support</groupId>
|
||||
<artifactId>compatibility-v4</artifactId>
|
||||
<version>19.1.0</version>
|
||||
</dependency>-->
|
||||
<!-- Instead we need to include the exact same version -->
|
||||
|
||||
<dependency>
|
||||
<groupId>com.jakewharton</groupId>
|
||||
<artifactId>disklrucache</artifactId>
|
||||
<version>2.0.2</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>android-support-v4.jar</groupId>
|
||||
<artifactId>android-support-v4.jar</artifactId>
|
||||
<version>1.0</version>
|
||||
<scope>system</scope>
|
||||
<systemPath>${basedir}/third_party/android-support-library/android-support-v4.jar</systemPath>
|
||||
</dependency>
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>com.actionbarsherlock</groupId>
|
||||
<artifactId>library</artifactId>
|
||||
<version>${actionbarsherlock-version}</version>
|
||||
<type>apklib</type>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>android</groupId>
|
||||
<artifactId>android</artifactId>
|
||||
<version>${google.android-version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<!--<dependency>-->
|
||||
<!--<groupId>android.support</groupId>-->
|
||||
<!--<artifactId>compatibility-v4</artifactId>-->
|
||||
<!--<version>19.1.0</version>-->
|
||||
<!--</dependency>-->
|
||||
|
||||
|
||||
<!-- MUST BE INSTALLED FIRST: cd owncloud-android-library; mvn install -->
|
||||
<dependency>
|
||||
<groupId>com.owncloud.android</groupId>
|
||||
<artifactId>owncloud-android-library</artifactId>
|
||||
<version>${owncloud.version}</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<finalName>${project.artifactId}</finalName>
|
||||
|
||||
<sourceDirectory>src</sourceDirectory>
|
||||
|
||||
<plugins>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.1</version>
|
||||
<configuration>
|
||||
<source>${java-version}</source>
|
||||
<target>${java-version}</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
|
||||
<artifactId>android-maven-plugin</artifactId>
|
||||
<version>3.8.2</version>
|
||||
<configuration>
|
||||
<sdk>
|
||||
<path>${env.ANDROID_HOME}</path>
|
||||
<platform>${google.android-api}</platform>
|
||||
</sdk>
|
||||
</configuration>
|
||||
<extensions>true</extensions>
|
||||
</plugin>
|
||||
|
||||
</plugins>
|
||||
|
||||
</build>
|
||||
|
||||
</project>
|
||||
|
||||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
:: Use argument to decide which build system should be used
|
||||
if "%1" == "gradle" goto initForGradle
|
||||
if "%1" == "maven" goto initForMaven
|
||||
if "%1" == "ant" goto initForAnt
|
||||
goto invalidInput
|
||||
|
||||
|
|
@ -10,10 +9,6 @@ goto invalidInput
|
|||
echo "Executing Gradle setup..."
|
||||
goto initDefault
|
||||
|
||||
:initForMaven
|
||||
echo "Executing Maven setup..."
|
||||
goto initDefault
|
||||
|
||||
:initForAnt
|
||||
echo "Executing Ant setup..."
|
||||
::If the directory exists the script has already been executed
|
||||
|
|
@ -43,7 +38,7 @@ goto complete
|
|||
|
||||
:invalidInput
|
||||
echo "Input argument invalid."
|
||||
echo "Usage: %0 [ant | maven | gradle]."
|
||||
echo "Usage: %0 [ant | gradle]."
|
||||
goto exit
|
||||
|
||||
:complete
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ function initForAnt {
|
|||
#No args
|
||||
if [ $# -lt 1 ]; then
|
||||
echo "No args found"
|
||||
echo "Usage : $0 [gradle | maven | ant]"
|
||||
echo "Usage : $0 [gradle | ant]"
|
||||
exit
|
||||
fi
|
||||
|
||||
|
|
@ -47,12 +47,8 @@ case "$1" in
|
|||
initDefault
|
||||
;;
|
||||
|
||||
"maven") echo "Creating maven environment"
|
||||
initDefault
|
||||
;;
|
||||
|
||||
*) echo "Argument not recognized"
|
||||
echo "Usage : $0 [gradle | maven | ant]"
|
||||
echo "Usage : $0 [gradle | ant]"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue