Merge pull request #12 from nextcloud/build24

AndyScherzinger · web-flow · commit 3a81bd5be427 · 2016-11-02T23:01:04.000+01:00
Update Toolchain/Android-Target to v24
diff --git a/.drone.yml b/.drone.yml
@@ -0,0 +1,14 @@
+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/
diff --git a/.lgtm b/.lgtm
@@ -1 +1,3 @@
 pattern = "(?i):shipit:|:\\+1:|LGTM"
+self_approval_off=true
+approvals = 1
diff --git a/.travis.yml b/.travis.yml
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -30,7 +30,7 @@
 
     <uses-sdk
         android:minSdkVersion="11"
-        android:targetSdkVersion="23" />
+        android:targetSdkVersion="24" />
 
 </manifest>
 
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Using Nextcloud Android library it will be the easiest way to communicate with N
 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,22 +37,27 @@ 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
 
 Nextcloud Android Library is available under MIT license. See [LICENSE.md](https://github.com/nextcloud/android-library/blob/master/LICENSE.md) with the full license text. 
 
 ### Third party libraries
 ```
-Nextcloud Android Library uses Apache JackRabbit, version 2.2.5. 
+Nextcloud Android Library uses Apache JackRabbit, version 2.12.2. 
 Copyright (C) 2004-2010 The Apache Software Foundation. 
 Licensed under Apache License, Version 2.0.
 ```
@@ -65,6 +70,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+.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
     }
 }
@@ -18,12 +18,12 @@ repositories {
 }
 
 dependencies {
-    compile 'org.apache.jackrabbit:jackrabbit-webdav:2.10.1'
+    compile 'org.apache.jackrabbit:jackrabbit-webdav:2.12.4'
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.2"
 
     sourceSets {
         main {
diff --git a/libs/jackrabbit-webdav-2.12.2.jar b/libs/jackrabbit-webdav-2.12.2.jar
diff --git a/project.properties b/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-23
+target=android-24
 android.library=true
diff --git a/sample_client/AndroidManifest.xml b/sample_client/AndroidManifest.xml
@@ -30,7 +30,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-sdk
         android:minSdkVersion="11"
-        android:targetSdkVersion="23" />
+        android:targetSdkVersion="24" />
     <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
         <activity 	android:name="MainActivity"
                   	android:label="@string/app_name"
diff --git a/sample_client/build.gradle b/sample_client/build.gradle
@@ -9,8 +9,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.2"
 
     sourceSets {
         main {
@@ -43,9 +43,4 @@ android {
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
     }
-    android {
-        lintOptions {
-            abortOnError false
-        }
-    }
 }
diff --git a/sample_client/project.properties b/sample_client/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-23
+target=android-24
 android.library.reference.1=..
diff --git a/sample_client/res/values/strings.xml b/sample_client/res/values/strings.xml
@@ -24,7 +24,7 @@
  -->
  
 <resources>
-    <string name="app_name">ownCloud Sample Client</string>
+    <string name="app_name">Nextcloud Sample Client</string>
     <string name="refresh">Refresh</string>
     <string name="upload">Upload</string>
     <string name="delete_remote_file">Delete remote file</string>
diff --git a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
@@ -49,7 +49,6 @@
  * <p/>
  * Allow updating several parameters, triggering a request to the server per parameter.
  */
-
 public class UpdateRemoteShareOperation extends RemoteOperation {
 
     private static final String TAG = GetRemoteShareOperation.class.getSimpleName();
@@ -159,24 +158,24 @@ protected RemoteOperationResult run(OwnCloudClient client) {
         }
         if (mExpirationDateInMillis < 0) {
             // clear expiration date
-            parametersToUpdate.add(new Pair(PARAM_EXPIRATION_DATE, ""));
+            parametersToUpdate.add(new Pair<>(PARAM_EXPIRATION_DATE, ""));
 
         } else if (mExpirationDateInMillis > 0) {
             // set expiration date
             DateFormat dateFormat = new SimpleDateFormat(FORMAT_EXPIRATION_DATE);
             Calendar expirationDate = Calendar.getInstance();
             expirationDate.setTimeInMillis(mExpirationDateInMillis);
             String formattedExpirationDate = dateFormat.format(expirationDate.getTime());
-            parametersToUpdate.add(new Pair(PARAM_EXPIRATION_DATE, formattedExpirationDate));
+            parametersToUpdate.add(new Pair<>(PARAM_EXPIRATION_DATE, formattedExpirationDate));
 
         } // else, ignore - no update
         if (mPermissions > 0) {
             // set permissions
-            parametersToUpdate.add(new Pair(PARAM_PERMISSIONS, Integer.toString(mPermissions)));
+            parametersToUpdate.add(new Pair<>(PARAM_PERMISSIONS, Integer.toString(mPermissions)));
         }
 
         if (mPublicUpload != null) {
-            parametersToUpdate.add(new Pair(PARAM_PUBLIC_UPLOAD, Boolean.toString(mPublicUpload)));
+            parametersToUpdate.add(new Pair<>(PARAM_PUBLIC_UPLOAD, Boolean.toString(mPublicUpload)));
         }
 
         /// perform required PUT requests
diff --git a/test_client/AndroidManifest.xml b/test_client/AndroidManifest.xml
@@ -39,7 +39,7 @@
 
 	<uses-sdk
         android:minSdkVersion="11"
-        android:targetSdkVersion="23" />
+        android:targetSdkVersion="24" />
 
     <application
         android:allowBackup="true"
diff --git a/test_client/build.gradle b/test_client/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
     }
 }
 
@@ -20,8 +20,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.2"
 
     sourceSets {
         main {
@@ -54,9 +54,4 @@ android {
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
     }
-    android {
-        lintOptions {
-            abortOnError false
-        }
-    }
 }
diff --git a/test_client/project.properties b/test_client/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-23
+target=android-24
 android.library.reference.1=..
diff --git a/test_client/res/values/strings.xml b/test_client/res/values/strings.xml
@@ -25,7 +25,7 @@
 
 <resources>
 
-    <string name="app_name">oc_framework-test-project</string>
+    <string name="app_name">Nc_framework-test-project</string>
     <string name="action_settings">Settings</string>
     <string name="hello_world">Hello world!</string>
     <string name="test_account_not_found">The test account %1$s could not be found in the device</string>
diff --git a/test_client/tests/project.properties b/test_client/tests/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-23
+target=android-24
diff --git a/test_client/tests/res/values/strings.xml b/test_client/tests/res/values/strings.xml
@@ -25,6 +25,6 @@
  
 <resources>
 
-    <string name="app_name">Oc_framework-testTest</string>
+    <string name="app_name">Nc_framework-testTest</string>
 
 </resources>
diff --git a/wait_for_emulator.sh b/wait_for_emulator.sh
@@ -1,19 +1,24 @@
 #!/bin/bash
 
+# Originally written by Ralf Kistner <ralf@embarkmobile.com>, but placed in the public domain
+
 bootanim=""
 failcounter=0
 checkcounter=0
+
 until [[ "$bootanim" =~ "stopped" ]]; do
    bootanim=`adb -e shell getprop init.svc.bootanim 2>&1`
    echo "($checkcounter) $bootanim"
    if [[ "$bootanim" =~ "not found" ]]; then
       let "failcounter += 1"
-      if [[ $failcounter -gt 30 ]]; then
+      if [[ $failcounter -gt 3 ]]; then
         echo "Failed to start emulator"
         exit 1
       fi
    fi
    let "checkcounter += 1"
    sleep 10
 done
-echo "Done"
+echo "($checkcounter) Done"
+adb -e shell input keyevent 82
+echo "($checkcounter) Unlocked emulator screen"

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`pattern = "(?i):shipit:\|:\\+1:\|LGTM"`
	`2`	`+self_approval_off=true`
	`3`	`+approvals = 1`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ buildscript {`
`3`	`3`	`jcenter()`
`4`	`4`	`}`
`5`	`5`	`dependencies {`
`6`		`- classpath 'com.android.tools.build:gradle:2.1.3'`
	`6`	`+ classpath 'com.android.tools.build:gradle:2.2.0'`
`7`	`7`	`classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'`
`8`	`8`	`}`
`9`	`9`	`}`
`@@ -18,12 +18,12 @@ repositories {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`dependencies {`
`21`		`- compile 'org.apache.jackrabbit:jackrabbit-webdav:2.10.1'`
	`21`	`+ compile 'org.apache.jackrabbit:jackrabbit-webdav:2.12.4'`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`android {`
`25`		`- compileSdkVersion 23`
`26`		`- buildToolsVersion "23.0.3"`
	`25`	`+ compileSdkVersion 24`
	`26`	`+ buildToolsVersion "24.0.2"`
`27`	`27`
`28`	`28`	`sourceSets {`
`29`	`29`	`main {`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ dependencies {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`android {`
`12`		`- compileSdkVersion 23`
`13`		`- buildToolsVersion "23.0.3"`
	`12`	`+ compileSdkVersion 24`
	`13`	`+ buildToolsVersion "24.0.2"`
`14`	`14`
`15`	`15`	`sourceSets {`
`16`	`16`	`main {`
`@@ -43,9 +43,4 @@ android {`
`43`	`43`	`packagingOptions {`
`44`	`44`	`exclude 'META-INF/LICENSE.txt'`
`45`	`45`	`}`
`46`		`- android {`
`47`		`- lintOptions {`
`48`		`- abortOnError false`
`49`		`- }`
`50`		`- }`
`51`	`46`	`}`