Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e97a329 authored by Tobias Kaminsky's avatar Tobias Kaminsky Committed by GitHub
Browse files

Merge branch 'master' into fixOOB

parents d8c19424 4dc3ad29
Loading
Loading
Loading
Loading

.drone.yml

0 → 100644
+14 −0
Original line number Diff line number Diff line
pipeline:
  test:
    image: nextcloudci/android:android-7
    commands:
      - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -c 20M
      - emulator -avd test -no-window &
      - ./wait_for_emulator.sh
      # build app 
      - ./gradlew clean build

    environment:
      - ANDROID_TARGET=android-24
      - ANDROID_ABI=armeabi-v7a
      - LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/:/opt/android-sdk-linux/tools/lib64/gles_mesa/
+2 −0
Original line number Diff line number Diff line
pattern = "(?i):shipit:|:\\+1:|LGTM"
self_approval_off=true
approvals = 1

.travis.yml

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line
sudo: false
language: android
android:
  components:
  - platform-tools
  - tools
  - build-tools-23.0.3
  - android-23
  - sys-img-armeabi-v7a-android-23
branches:
  only:
  - master
before_install:
- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
  -c 20M
- emulator -avd test -no-skin -no-audio -no-window &
- rm pom.xml
- android update project -p .
- chmod +x ./wait_for_emulator.sh
- ./wait_for_emulator.sh
script:
#- ant clean
#- ant debug
#- cd test_client/tests
#- ant acceptance-test
#- cd ../..
- ./gradlew clean build
env:
  global:
  # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
  #   via the "travis encrypt" command using the project repo's public key
#  - secure: epTZ0zZGDbHL3o6vSC9uNkZsi5j5SA6O/tvQBH7QW/dluuzIJxIjfhNbZHDyBReYDleirLzUFQpdWAUdvulCMLs/qZdIzFGlYXZSpxEnvPYMGQcilwADdJcxLw8L+3+ET5hSexxhjrTGw427IljkqGUpqQTxaLwFdFu98lDWSbc=
  # The next 3 declarations are the variables needed to access the test server,
  #   added via "travis encrypt", using the repo public key
#  - secure: gPCBnpGLA2sdSMtfhT+/InThmXNEU8XrrS54uuIP8iXBLvVe0yZrNl76GbMosV0ry3YtDngsmsbHwRjPPb0+3mTTdAqZ60HHzGaNPgEm6b5t0t4bpJ3LW9osLZsuf9jRsI2LD66zxblaMrK2+8hN/dUrj707ijsZHp3SPSQJ6g8=
#  - secure: AnxLVarfwM7IhJ7Sca35USyRlFHFvlcBhWTt2TVDcyQ+ldDyb+U6IWXFK0Yy82QP0ZH/RCLu7FnmHK/rKG0BHNRt1Ymco1VkTQql0MZcHXP+4IKgEvgJyUn1TqYj+hSVmM6lgTA+QUjZYGSfwU8mhUFiU7644ZTdTe6ALdqa+v8=
#  - secure: ezKyZbb3q1Phcv/vJntuJe0C2req+Hp4/C+tFZIWZ3o8wRO9jVI3bnED9TWQyQOOT0SoRYjJ5zqp0UcEOGCzPeWFO6bA7RWp+zA/R9sziLNcVWMVv3WXnuClQjPBHJeXRnP7YmNjxDmSfV97a14dk5d9LgJZYliTDepH4dLsxro=
#  - secure: HV8REF7bB1i6cBEe4YCZvjgTf6tGiptAPzp9qZXGUH9Lxh6yUjYMXXP8flDaIFcE2JuAakW6P4SPr7/SQ+X4f8/84cNhmU1I+6Y1nG37WvelRHQVslOUDbl1TNUnynYZ+ybkb3BtrQvggCGMdQKvGZXYiggFhN/TWuDo0c7Q2Ro=
  matrix:
  - ANDROID_TARGET=android-23 ANDROID_ABI=armeabi-v7a
#addons:
#  coverity_scan:
#    project:
#      name: nextcloud/android-library
#      description: Build submitted via Travis CI
#    notification_email: lukas@nextcloud.com
#    build_command_prepend: gradle clean
#    build_command: gradle build
#    branch_pattern: coverity_scan
+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@

    <uses-sdk
        android:minSdkVersion="11"
        android:targetSdkVersion="23" />
        android:targetSdkVersion="24" />

</manifest>
+16 −12
Original line number Diff line number Diff line
# [Nextcloud](https://nextcloud.com) Android Library 
**Build status:** master ![](https://api.travis-ci.org/nextcloud/android-library.svg?branch=master)
# [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&amp;utm_medium=referral&amp;utm_content=nextcloud/android-library&amp;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.

## Use Library
In the repository it is not only the library project but also the example project sample_client; 
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.

*There are different ways of adding this library to your code*
@@ -37,14 +36,19 @@ The repository holds one main branch with an infinite lifetime:

Branch __origin/master__ is considered the main branch where the source code of HEAD always reflects a state with the latest delivered development changes for the next release.

Other branches, some supporting branches are used to aid parallel development between team members, ease tracking of features, prepare for production releases and to assist in quickly fixing live production problems. Unlike the main branches, these branches always have a limited life time, since they will be removed eventually.
Other branches, some supporting branches are used to aid parallel development between team members, ease tracking of features and to assist in quickly fixing live production problems. Unlike the main branch, these branches always have a limited life time, since they will be removed eventually (feature branching).

The different types of branches we use:
## Development process
We are all about quality while not sacrificing speed so we use a very pragmatic workflow.

- Branch __perNewFeature__    
- Branch  __releaseBranches__

Both of them branch off from master and must merge back into master branch through a [pull requests](https://github.com/nextcloud/android-library/pulls) in Github. Once the PR is approved and merged, the branch may be deleted.
* create an issue with feature request
    * discuss it with other developers 
    * create mockup if necessary
    * must be approved --> label approved
    * after that no conceptual changes!
* develop code
* create [pull request](https://github.com/nextcloud/android-library/pulls)
* to assure the quality of the app, any PR gets reviewed, approved and tested by [two developers](https://github.com/nextcloud/android-library/blob/master/MAINTAINERS) before it will be merged to master

##  License

@@ -52,7 +56,7 @@ Nextcloud Android Library is available under MIT license. See [LICENSE.md](https

### Third party libraries
```
Nextcloud Android Library uses Apache JackRabbit, version 2.2.5. 
Nextcloud Android Library uses Apache JackRabbit, version 2.12.4. 
Copyright (C) 2004-2010 The Apache Software Foundation. 
Licensed under Apache License, Version 2.0.
```
@@ -65,6 +69,6 @@ Licensed under Apache License, Version 2.0.

## Compatibility

Nextcloud Android library is valid for Android version 3.0 and up (android:minSdkVersion="11" android:targetSdkVersion="23").
Nextcloud Android library is valid for Android version 3.0 and up (with ```android:minSdkVersion="11"``` and ```android:targetSdkVersion="24"```).

Nextcloud Android library supports Nextcloud server from version 9.
Nextcloud Android library supports Nextcloud server from version 9+.
Loading