Merge branch 'release/1.2.0'

.gitattributes

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

LiferayScreens.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 	s.name         = 'LiferayScreens'
 	s.module_name  = 'LiferayScreens'
-	s.version      = '1.1.0'
+	s.version      = '1.2.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 = { 
@@ -41,8 +41,7 @@ Pod::Spec.new do |s|
 
 	s.resource_bundle = {
 		'LiferayScreens-core' => 'ios/Framework/Core/**/*.{plist,lproj}',
-		'LiferayScreens-default' => 'ios/Framework/Themes/Default/**/*.{xib,png,plist,lproj}',
-		'LiferayScreens-flat7' => 'ios/Framework/Themes/Flat7/**/*.{xib,png,plist,lproj}'
+		'LiferayScreens-default' => 'ios/Framework/Themes/Default/**/*.{xib,png,plist,lproj}'
 	}
 
 	s.xcconfig = {
@@ -52,20 +51,21 @@ Pod::Spec.new do |s|
 
 	# Core
 	s.dependency 'Liferay-iOS-SDK', '6.2.0.17'
-	s.dependency 'Liferay-OAuth'
-	s.dependency 'MBProgressHUD', '~> 0.9.1'
-	s.dependency 'SMXMLDocument'
-	s.dependency 'ODRefreshControl'
+	s.dependency 'Liferay-OAuth', '0.1.0'
+	s.dependency 'MBProgressHUD', '0.9.1'
+	s.dependency 'SMXMLDocument', '1.1'
+	s.dependency 'ODRefreshControl', '1.2'
+	s.dependency 'YapDatabase', '2.6.5'
 
 	# Login & signup: save credentials
-	s.dependency 'KeychainAccess'
+	s.dependency 'KeychainAccess', '1.2.1'
 
 	# UserPortrait
-	s.dependency 'CryptoSwift'
+	s.dependency 'CryptoSwift', '0.0.13'
 
 	# DDLForm
-	s.dependency 'DTPickerPresenter'
-	s.dependency 'TNRadioButtonGroup'
-	s.dependency 'MDRadialProgress'
+	s.dependency 'DTPickerPresenter', '0.2.0'
+	s.dependency 'TNRadioButtonGroup', '0.4'
+	s.dependency 'MDRadialProgress', '1.3.2'
 
 end

android/library/build.gradle

@@ -1,26 +1,22 @@
-apply plugin: 'maven'
-
 buildscript {
 	repositories {
 		jcenter()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:1.2.3'
+		classpath 'com.android.tools.build:gradle:1.3.0'
+		classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
 		classpath 'com.github.dcendents:android-maven-plugin:1.2'
-		classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
 	}
 }
 
 subprojects {
 	repositories {
-		mavenLocal()
 
 		maven {
 			url 'https://repository.liferay.com/nexus/content/groups/liferay-ce'
 		}
 
 		jcenter()
-		mavenCentral()
 	}
 
 	configurations {
@@ -35,39 +31,103 @@ subprojects {
 		formatter group: 'org.apache.ant', name: 'ant', version: '1.8.2'
 	}
 
+}
 
-//	task format(type: JavaExec) {
-//		main = 'com.liferay.portal.tools.sourceformatter.SourceFormatter'
-//		classpath = configurations.formatter
-//		workingDir = 'src'
-//	}
-//
-//	task formatResources(type: JavaExec) {
-//		main = format.main
-//		classpath = format.classpath
-//		workingDir = 'res'
-//	}
-//
-//	task wrapper(type: Wrapper) {
-//		gradleVersion = '2.2.1'
-//	}
-//
-//    uploadArchives {
-//        repositories.mavenDeployer {
-//            def deployPath = file(getProperty('aar.deployPath'))
-//            repository(url: "file://${deployPath.absolutePath}")
-//            pom.project {
-//                groupId 'com.liferay.mobile'
-//                artifactId 'liferay-screens'
-//                version "0.3.2"
-//            }
-//        }
-//    }
+subprojects {
 
+	version = '1.2.0'
+	group = 'com.liferay.mobile'
 
-}
-allprojects {
-	repositories {
-		jcenter()
+	buildscript {
+		repositories {
+			jcenter()
+		}
+		dependencies {
+			classpath 'com.github.dcendents:android-maven-plugin:1.2'
+			classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
+		}
+	}
+
+	apply plugin: 'com.android.library'
+	apply plugin: 'maven'
+	apply plugin: 'com.jfrog.bintray'
+	apply plugin: 'com.github.dcendents.android-maven'
+
+	def siteUrl = 'https://github.com/liferay/liferay-screens'
+	def gitUrl = 'https://github.com/liferay/liferay-screens.git'
+
+	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
+	}
+
+	install {
+		repositories.mavenInstaller {
+			// This generates POM.xml with proper parameters
+			pom {
+				project {
+					packaging 'aar'
+
+					// Add your description here
+					name 'Liferay Screens for Android includes the component (screenlets) library and a sample project.'
+					url siteUrl
+
+					// Set your license
+					licenses {
+						license {
+							name 'The Apache Software License, Version 2.0'
+							url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+						}
+					}
+					developers {
+						developer {
+							id '1'
+							name 'Javier Gamarra'
+							email '[email protected]'
+						}
+					}
+					scm {
+						connection gitUrl
+						developerConnection gitUrl
+						url siteUrl
+
+					}
+				}
+			}
+		}
+	}
+
+	Properties properties = new Properties()
+	properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
+	bintray {
+		user = properties.getProperty("bintray.user")
+		key = properties.getProperty("bintray.apikey")
+
+		configurations = ['archives']
+		pkg {
+//		userOrg = 'liferay'
+			repo = "liferay-mobile"
+			name = project.archivesBaseName
+			websiteUrl = siteUrl
+			vcsUrl = gitUrl
+			licenses = ["LGPL-2.1"]
+			publish = true
+		}
 	}
 }

android/library/core/build.gradle

@@ -1,13 +1,12 @@
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
 
 android {
-	compileSdkVersion 22
-	buildToolsVersion "22.0.1"
+	compileSdkVersion 23
+	buildToolsVersion "23.0.1"
 
 	defaultConfig {
 		minSdkVersion 15
-		targetSdkVersion 22
+		targetSdkVersion 23
 		versionCode 1
 		versionName "1.0"
 	}
@@ -34,120 +33,47 @@ repositories {
 	}
 
 	jcenter()
-	mavenCentral()
 }
 
-dependencies {
-	compile fileTree(dir: 'libs', include: ['*.jar'])
-	compile 'com.android.support:appcompat-v7:22.2.0'
-	compile 'com.android.support:recyclerview-v7:22.2.0'
-	compile 'com.liferay.mobile:liferay-android-sdk:6.2.0.20'
-	compile 'com.liferay.mobile:liferay-push:1.0.2'
-
-	compile 'de.greenrobot:eventbus:2.4.0'
-	compile 'com.squareup.picasso:picasso:2.5.0'
-	compile group: 'com.liferay.mobile', name: 'liferay-android-oauth', version: '1.+'
-	compile('de.keyboardsurfer.android.widget:crouton:1.8.5@aar') {
-		exclude group: 'com.google.android', module: 'support-v4'
-	}
-	testCompile "junit:junit:4.12"
-	testCompile "org.robolectric:robolectric:3.0-rc2"
-	testCompile 'org.mockito:mockito-core:1.9.5'
-
-}
-
-version = '1.1.2'
-group = 'com.liferay.mobile'
-
-project.archivesBaseName = 'liferay-screens'
-
 buildscript {
 	repositories {
 		jcenter()
 	}
 	dependencies {
 		classpath 'com.github.dcendents:android-maven-plugin:1.2'
 		classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
+		classpath 'com.neenbedankt.gradle.plugins:android-apt:1.6'
 	}
 }
 
-apply plugin: 'com.github.dcendents.android-maven'
-
-def siteUrl = 'https://github.com/liferay/liferay-screens'
-def gitUrl = 'https://github.com/liferay/liferay-screens.git'
-
-install {
-	repositories.mavenInstaller {
-		// This generates POM.xml with proper parameters
-		pom {
-			project {
-				packaging 'aar'
-
-				// Add your description here
-				name 'Liferay Screens for Android includes the component (screenlets) library and a sample project.'
-				url siteUrl
-
-				// Set your license
-				licenses {
-					license {
-						name 'The Apache Software License, Version 2.0'
-						url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-					}
-				}
-				developers {
-					developer {
-						id '1'
-						name 'Javier Gamarra'
-						email '[email protected]'
-					}
-				}
-				scm {
-					connection gitUrl
-					developerConnection gitUrl
-					url siteUrl
-
-				}
-			}
-		}
-	}
-}
+apply plugin: 'com.neenbedankt.android-apt'
 
-task sourcesJar(type: Jar) {
-	from android.sourceSets.main.java.srcDirs
-	classifier = 'sources'
-}
+dependencies {
+	compile fileTree(dir: 'libs', include: ['*.jar'])
+	compile 'com.android.support:appcompat-v7:23.0.1'
+	compile 'com.android.support:recyclerview-v7:23.0.1'
 
-task javadoc(type: Javadoc) {
-	source = android.sourceSets.main.java.srcDirs
-//	classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-}
+	compile 'com.liferay.mobile:liferay-android-sdk:2.0.2'
+	compile 'com.liferay.mobile:liferay-push:1.0.7'
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
-	classifier = 'javadoc'
-	from javadoc.destinationDir
-}
-artifacts {
-	archives javadocJar
-	archives sourcesJar
-}
+	compile 'de.greenrobot:eventbus:2.4.0'
+	compile 'com.squareup.picasso:picasso:2.5.2'
 
-apply plugin: 'com.jfrog.bintray'
+	compile('com.liferay.mobile:liferay-android-oauth:1.0.3') {
+		exclude group: 'com.liferay.mobile', module: 'liferay-android-sdk'
+	}
+	compile('de.keyboardsurfer.android.widget:crouton:1.8.5@aar') {
+		exclude group: 'com.google.android', module: 'support-v4'
+	}
 
-Properties properties = new Properties()
-properties.load(project.rootProject.file('local.properties').newDataInputStream())
+	compile 'com.pushtorefresh.storio:sqlite-annotations:1.4.0'
 
-bintray {
-	user = properties.getProperty("bintray.user")
-	key = properties.getProperty("bintray.apikey")
+	apt 'com.pushtorefresh.storio:sqlite-annotations-processor:1.4.0'
+
+	compile 'com.pushtorefresh.storio:sqlite:1.4.0'
+
+	testCompile "junit:junit:4.12"
+	testCompile "org.robolectric:robolectric:3.0-rc2"
+	testCompile 'org.mockito:mockito-core:1.9.5'
 
-	configurations = ['archives']
-	pkg {
-//		userOrg = 'liferay'
-		repo = "liferay-mobile"
-		name = "liferay-screens"
-		websiteUrl = siteUrl
-		vcsUrl = gitUrl
-		licenses = ["LGPL-2.1"]
-		publish = true
-	}
 }