Merge branch 'release/1.4.0'

.gitattributes

@@ -1 +0,0 @@
-*.pbxproj text -crlf -diff -merge=union

.travis.yml

@@ -1,59 +1,49 @@
 language: objective-c
-osx_image: xcode7.1
+osx_image: xcode7.3
+
+sudo: false
+
+env:
+  global:
+    - ADB_INSTALL_TIMEOUT=10 # minutes (2 minutes by default)
+
+#addons:
+#  artifacts:
+#    paths: /Users/travis/build/nhpatt/liferay-screens/android/samples/test-app/build/reports/androidTests/connected/
+#  s3_region: "eu-west-1"
 
 cache:
-    - cocoapods
+  directories:
+    - $HOME/android/library/.gradle/
 
 podfile: ios/Framework
 
 before_install:
 
     #Android installation (sdk, emulator, wait & unlock)
-    - export COMPONENTS=build-tools-23.0.2,android-19,android-23,extra-android-m2repository,extra-google-m2repository,sys-img-armeabi-v7a-android-19
-    - curl -L https://raw.github.com/embarkmobile/android-sdk-installer/version-2/android-sdk-installer | bash /dev/stdin --install=$COMPONENTS && source ~/.android-sdk-installer/env
-    - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a
-    - emulator -avd test -no-skin -no-audio -no-window &
-    - adb wait-for-device
-    - adb shell input keyevent 82 &
+    - export LICENSES="android-sdk-license-5be876d5|mips-android-sysimage-license-15de68cc|intel-android-sysimage-license-1ea702d1|android-sdk-license-ed0d0a5b|android-sdk-license-c81a61d9"
+    - export COMPONENTS=build-tools-23.0.3,android-23,extra-android-m2repository,extra-google-m2repository
+    - curl -L https://raw.github.com/embarkmobile/android-sdk-installer/version-2/android-sdk-installer | bash /dev/stdin --install=$COMPONENTS --accept=$LICENSES && source ~/.android-sdk-installer/env
 
     #iOS installation (gem, brew & pods)
     - export LANG=en_US.UTF-8
-    - gem install cocoapods
+    - gem install cocoapods --version 0.39.0
     - brew update > /dev/null
     - brew outdated xctool || brew upgrade xctool
     - env
     - locale
     - pod --version
 
-before_script:
-#    - curl https://raw.githubusercontent.com/travis-ci/travis-cookbooks/62039b204699adcdf4b3365fac42d81246cb57fe/ci_environment/android-sdk/files/default/android-wait-for-emulator > android-wait-for-emulator
-#    - chmod u+x android-wait-for-emulator
-#    - ./android-wait-for-emulator
-
 script:
-    - cd android/library/
-    - echo "sdk.dir=$ANDROID_HOME" > local.properties
-#    - ./gradlew -x javadocJar -x sourcesJar build test
+    - cd android/
+#    - echo "sdk.dir=$HOME/.android-sdk-installer" > local.properties
     - ./gradlew clean
-    - ./gradlew assembleDebug
-    - ./gradlew assembleDebugAndroidTest
+    - ./gradlew assembleTravisci
+#    - ./gradlew assembleDebugAndroidTest
     - ./gradlew test
 
-#    - test-app tests
-    - cd ../samples/test-app/
-    - ./gradlew clean
-    - ./gradlew assembleDebug
-    - ./gradlew assembleDebugAndroidTest
-    - adb shell pm list packages
-    - adb install app/build/outputs/apk/app-debug.apk
-    - adb install app/build/outputs/apk/app-debug-androidTest-unaligned.apk
-#    - adb shell am instrument -w com.nhpatt.catalogodeactividadesasde/android.support.test.runner.AndroidJUnitRunner
-    - adb shell input keyevent 82 &
-    - ./gradlew connectedAndroidTest
-
-#    - iOS tests
-    - cd ../../..
-    - cd ios/Framework
+##    - iOS tests
+    - cd ../ios/Framework
     - pod install
     - ./run-tests.sh
     - cd ../..

LiferayScreens.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 	s.name         = 'LiferayScreens'
 	s.module_name  = 'LiferayScreens'
-	s.version      = '1.3.0'
+	s.version      = '1.4.0'
 	s.summary      = 'A family of visual components called screenlets that are connected to the Liferay Platform used as a backend'
 	s.homepage     = 'https://www.liferay.com/liferay-screens'
 	s.license = { 
@@ -51,12 +51,12 @@ Pod::Spec.new do |s|
 	}
 
 	# Core
-	s.dependency 'Liferay-iOS-SDK', '6.2.0.22'
-	s.dependency 'Liferay-OAuth', '0.1.1'
+	s.dependency 'Liferay-iOS-SDK', '~> 7.0.3'
+	s.dependency 'Liferay-OAuth', '~> 1.2.0'
 	s.dependency 'MBProgressHUD', '0.9.1'
 	s.dependency 'SMXMLDocument', '1.1'
 	s.dependency 'ODRefreshControl', '1.2'
-	s.dependency 'YapDatabase', '2.6.5'
+	s.dependency 'YapDatabase/SQLCipher', '2.8.2'
 
 	# Login & signup: save credentials
 	s.dependency 'KeychainAccess', '2.3.1'

android/library/.gitignore → android/.gitignore

@@ -3,4 +3,3 @@
 .idea
 /build
 /local.properties
-/library

android/bintray.gradle

@@ -0,0 +1,46 @@
+apply plugin: 'com.jfrog.bintray'
+
+version = versionName
+
+task sourcesJar(type: Jar) {
+	from android.sourceSets.main.java.srcDirs
+	classifier = 'sources'
+}
+
+task javadoc(type: Javadoc) {
+	source = android.sourceSets.main.java.srcDirs
+	classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+	classifier = 'javadoc'
+	from javadoc.destinationDir
+}
+artifacts {
+	archives javadocJar
+	archives sourcesJar
+}
+
+Properties properties = new Properties()
+try {
+	properties.load(project.rootProject.file('local.properties').newDataInputStream())
+} catch (FileNotFoundException ignore) {
+}
+
+bintray {
+	user = properties.getProperty("bintray.user")
+	key = properties.getProperty("bintray.apikey")
+
+	configurations = ['archives']
+	pkg {
+		repo = bintrayRepo
+		name = project.archivesBaseName
+		userOrg = bintrayOrg
+		desc = libraryDescription
+		websiteUrl = siteUrl
+		vcsUrl = gitUrl
+		licenses = allLicenses
+		publish = true
+		publicDownloadNumbers = true
+	}
+}

android/build.gradle

@@ -0,0 +1,70 @@
+buildscript {
+	repositories {
+		jcenter()
+	}
+
+	dependencies {
+		classpath 'com.android.tools.build:gradle:2.1.0'
+		classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
+		classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+		classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
+	}
+}
+
+ext {
+	minSdkVersion = 15
+	compileSdkVersion = 23
+	targetSdkVersion = compileSdkVersion
+	buildToolsVersion = '23.0.3'
+
+	versionCode = 5
+	versionName = '1.4.0.rc8'
+
+	publishedGroupId = 'com.liferay.mobile'
+	libraryName = 'Liferay Screens for Android'
+	libraryDescription = 'Liferay Screens for Android includes the component (screenlets) library and a sample project'
+
+	bintrayRepo = 'liferay-mobile'
+	bintrayOrg = ''
+	//	bintrayOrg = 'liferay'
+
+	siteUrl = 'https://github.com/liferay/liferay-screens'
+	gitUrl = 'https://github.com/liferay/liferay-screens.git'
+
+	developerId = 'nhpatt'
+	developerName = 'Javier Gamarra'
+	developerEmail = '[email protected]'
+
+	licenseName = 'GNU Lesser General Public License, version 2.1'
+	licenseUrl = 'http://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html'
+	allLicenses = ["LGPL-2.1"]
+}
+
+def supportLibsVersion = '23.3.0'
+
+ext.libraries = [
+		appCompat        : 'com.android.support:appcompat-v7:' + supportLibsVersion,
+		recyclerView     : 'com.android.support:recyclerview-v7:' + supportLibsVersion,
+		design           : 'com.android.support:design:' + supportLibsVersion,
+		junit            : 'junit:junit:4.12',
+		gms              : 'com.google.android.gms:play-services-gcm:7.0.0',
+		sdk              : 'com.liferay.mobile:liferay-android-sdk:7.0.2',
+		push             : 'com.liferay.mobile:liferay-push:1.0.8',
+		oauth            : 'com.liferay.mobile:liferay-android-oauth:1.3.0',
+		eventbus         : 'de.greenrobot:eventbus:2.4.0',
+		picasso          : 'com.squareup.picasso:picasso:2.5.2',
+		storio           : 'com.pushtorefresh.storio:sqlite:1.8.0',
+		storioannotations: 'com.pushtorefresh.storio:sqlite-annotations:1.8.0',
+		storioapt        : 'com.pushtorefresh.storio:sqlite-annotations-processor:1.8.0',
+		rxjava           : 'io.reactivex:rxjava:1.1.3',
+		rxpermissions    : 'com.tbruyelle.rxpermissions:rxpermissions:0.5.2@aar',
+		rxbinding        : 'com.jakewharton.rxbinding:rxbinding:0.4.0',
+		robolectric      : 'org.robolectric:robolectric:3.0',
+		mockito          : 'org.mockito:mockito-core:2.0.43-beta',
+]
+
+subprojects {
+	repositories {
+		jcenter()
+	}
+}

android/samples/test-app/gradle/wrapper/gradle-wrapper.properties → android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Dec 15 11:44:53 CET 2015
+#Mon Dec 28 10:00:20 PST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

android/samples/addbookmarkscreenlet/gradlew → android/gradlew

@@ -42,11 +42,6 @@ case "`uname`" in
     ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -114,6 +109,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`