Merge pull request #361 from nextcloud/v2withActivity (abb428fa) · Commits · e / os / Nextcloud Android Library

.drone.yml

+2 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,8 @@ services:
		- su www-data -c "php /var/www/html/occ group:add users"
		- su www-data -c "php /var/www/html/occ group:adduser users user1"
		- su www-data -c "php /var/www/html/occ group:adduser users user2"
		- su www-data -c "git clone -b master https://github.com/nextcloud/activity.git /var/www/html/apps/activity/"
		- su www-data -c "php /var/www/html/occ app:enable activity"
		- /run.sh

		trigger:

README.md

+6 −1

Original line number	Diff line number	Diff line
		# [Nextcloud](https://nextcloud.com) Android Library [![Build Status](https://drone.nextcloud.com/api/badges/nextcloud/android-library/status.svg)](https://drone.nextcloud.com/nextcloud/android-library) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d9f94f04e0f447a6b21c0ae08f6f7594)](https://www.codacy.com/app/Nextcloud/android-library?utm_source=github.com&utm_medium=referral&utm_content=nextcloud/android-library&utm_campaign=Badge_Grade)
		# [Nextcloud](https://nextcloud.com) Android Library v2 [![Build Status](https://drone.nextcloud.com/api/badges/nextcloud/android-library/status.svg)](https://drone.nextcloud.com/nextcloud/android-library) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d9f94f04e0f447a6b21c0ae08f6f7594)](https://www.codacy.com/app/Nextcloud/android-library?utm_source=github.com&utm_medium=referral&utm_content=nextcloud/android-library&utm_campaign=Badge_Grade)

		## Introduction
		Using Nextcloud Android library it will be the easiest way to communicate with Nextcloud servers.
		Add this library in your project and integrate your application with Nextcloud seamlessly.

		## Android Library v2
		Starting from 01.10.2019 we will not actively develop our old library (v1), but maintain it until 01.10.2021 with bug fixes.
		v2 is using [OkHTTP](https://square.github.io/okhttp) and [DAV4jvm](https://gitlab.com/bitfireAT/dav4jvm) by [BitfireAT](https://www.bitfire.at/).


		## Use Library
		In the repository it is not only the library project but also the example project "sample_client";
		thanks to it you will learn how to use the library.

build.gradle

+13 −7

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@ buildscript {
		}
		mavenCentral()
		}

		dependencies {
		classpath 'com.android.tools.build:gradle:3.5.3'
		classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
		@@ -44,12 +45,16 @@ repositories {

		configurations.all {
		exclude group: 'com.google.firebase', module: 'firebase-core'
		exclude group: 'org.ogce', module: 'xpp3' // xpp3 is for plain java, Android uses kxml2

		// check for updates every build
		resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
		}

		dependencies {
		api 'org.apache.jackrabbit:jackrabbit-webdav:2.12.6'
		implementation 'org.apache.jackrabbit:jackrabbit-webdav:2.13.1'
		api 'com.squareup.okhttp3:okhttp:3.14.2'
		implementation 'com.gitlab.bitfireAT:dav4jvm:1.0' // in transition phase, we use old and new libs
		implementation 'org.parceler:parceler-api:1.1.12'
		annotationProcessor 'org.parceler:parceler:1.1.12'
		implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
		@@ -59,27 +64,28 @@ dependencies {
		compileOnly 'org.projectlombok:lombok:1.18.10'
		annotationProcessor 'org.projectlombok:lombok:1.18.10'

		implementation "androidx.core:core-ktx:1.1.0"
		implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"

		spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.10.1'
		spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.7'

		// dependencies for tests
		testImplementation 'junit:junit:4.12'
		testImplementation 'org.mockito:mockito-core:3.2.0'



		// dependencies for instrumented tests
		// JUnit4 Rules
		androidTestImplementation 'junit:junit:4.12'
		androidTestImplementation 'androidx.test.ext:junit:1.1.1'
		androidTestImplementation 'androidx.test:rules:1.2.0'

		// Android JUnit Runner
		androidTestImplementation 'androidx.test:runner:1.2.0'

		androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
		androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.2.0'
		androidTestImplementation 'commons-io:commons-io:2.6'
		implementation "androidx.core:core-ktx:1.1.0"
		implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
		}

		spotbugs {

lint.xml

+1 −1

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<lint>
		<issue id="InvalidPackage">
		<ignore path="**/jackrabbit-webdav-2.12.6.jar" />
		<ignore path="/jackrabbit-webdav-2..jar" />
		</issue>
		</lint>

scripts/analysis/findbugs-results.txt

+1 −1

Original line number	Diff line number	Diff line
		163
		No newline at end of file
		160
		No newline at end of file