From e4055c865e66d873557abfa156726cc5f3eaf3f7 Mon Sep 17 00:00:00 2001 From: Takuma Date: Wed, 18 Mar 2015 20:35:44 +0800 Subject: [PATCH 1/2] Update: Support gradle to compile third party --- .gitignore | 2 ++ Simple Facebook Sample/build.gradle | 8 ++++++-- Simple Facebook/build.gradle | 12 ++++++++---- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 5 ++--- local.properties | 11 +++++++++++ settings.gradle | 4 ++-- 7 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 local.properties diff --git a/.gitignore b/.gitignore index 4dcbfe6..5c6dc93 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ build/ *.orig .gradle/ +*.iml +.idea/ diff --git a/Simple Facebook Sample/build.gradle b/Simple Facebook Sample/build.gradle index 6ab4a76..9507c67 100644 --- a/Simple Facebook Sample/build.gradle +++ b/Simple Facebook Sample/build.gradle @@ -4,12 +4,16 @@ dependencies { compile project(':Simple Facebook') } +repositories { + mavenCentral() +} + android { compileSdkVersion 19 - buildToolsVersion "19" + buildToolsVersion "19.1.0" defaultConfig { - minSdkVersion 8 + minSdkVersion 9 targetSdkVersion 19 } diff --git a/Simple Facebook/build.gradle b/Simple Facebook/build.gradle index bf7eb1b..6aa7ae6 100644 --- a/Simple Facebook/build.gradle +++ b/Simple Facebook/build.gradle @@ -1,15 +1,19 @@ -apply plugin: 'android-library' +apply plugin: 'com.android.library' dependencies { - compile project(':facebook-android-sdk:facebook') + compile 'com.facebook.android:facebook-android-sdk:3.23.1' +} + +repositories { + mavenCentral() } android { compileSdkVersion 19 - buildToolsVersion "19" + buildToolsVersion "19.1.0" defaultConfig { - minSdkVersion 8 + minSdkVersion 9 targetSdkVersion 19 } diff --git a/build.gradle b/build.gradle index edafa6c..90f2e14 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.9.+' + classpath 'com.android.tools.build:gradle:1.0.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 349e683..9bb9155 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,6 @@ -#Mon Jul 28 14:15:41 CST 2014 +#Wed Mar 18 20:12:49 CST 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-1.11-bin.zip - +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip diff --git a/local.properties b/local.properties new file mode 100644 index 0000000..d469267 --- /dev/null +++ b/local.properties @@ -0,0 +1,11 @@ +## This file is automatically generated by Android Studio. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Wed Mar 18 19:25:08 CST 2015 +sdk.dir=/Users/TakumaLee/Documents/Mobile/android/sdk diff --git a/settings.gradle b/settings.gradle index 53f9c3f..87efe4d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -include ':facebook-android-sdk:facebook' -project(':facebook-android-sdk:facebook').projectDir = new File(settingsDir, '../facebook-android-sdk/facebook') +//include ':facebook-android-sdk:facebook' +//project(':facebook-android-sdk:facebook').projectDir = new File(settingsDir, '../facebook-android-sdk/facebook') include ':Simple Facebook' include ':Simple Facebook Sample' From d93b20e35c191843e65f633f3695a3321050a65a Mon Sep 17 00:00:00 2001 From: Takuma Date: Wed, 18 Mar 2015 20:49:22 +0800 Subject: [PATCH 2/2] Update: Use gradle script to publish aar for android, and can compile by mavencentral --- Simple Facebook/build.gradle | 74 ++++++++++++++++++++++++++++++++++++ build.gradle | 3 ++ 2 files changed, 77 insertions(+) diff --git a/Simple Facebook/build.gradle b/Simple Facebook/build.gradle index 6aa7ae6..398f36e 100644 --- a/Simple Facebook/build.gradle +++ b/Simple Facebook/build.gradle @@ -1,4 +1,12 @@ apply plugin: 'com.android.library' +apply plugin: 'com.github.dcendents.android-maven' +apply plugin: 'com.jfrog.bintray' + +version = "2.2" // library version + +def siteUrl = 'https://github.com/sromku/android-simple-facebook' // project homepage +def gitUrl = 'https://github.com/sromku/android-simple-facebook.git' // project git +group = "" dependencies { compile 'com.facebook.android:facebook-android-sdk:3.23.1' @@ -33,3 +41,69 @@ android { } } } + +install { + repositories.mavenInstaller { + // This generates POM. xml with proper parameters + pom { + project { + packaging 'aar' + name 'Simple to use Facebook SDK For Android' + url siteUrl + licenses { + license { + name 'The Apache Software License, Version 2.0' + url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + developers { + developer { // #CONFIG# Change to Your information + id 'takumalee' + name 'takumalee' + email 'vmgsahm1@gmail.com' + } + } + scm { connection gitUrl + developerConnection gitUrl + url siteUrl + } + } + } + } +} + +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() +properties.load(project.rootProject.file('local.properties').newDataInputStream()) +bintray { + key = properties.getProperty("bintray.apikey") + user = properties.getProperty("bintray.user") + configurations = ['archives'] + pkg { + repo = "maven" + name = "SimpleFacebook" // #CONFIG# project name in jcenter + websiteUrl = siteUrl + vcsUrl = gitUrl + licenses = ["Apache-2.0"] + publish = true + } +} diff --git a/build.gradle b/build.gradle index 90f2e14..dfa6a39 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { + jcenter() mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0' + classpath 'com.github.dcendents:android-maven-plugin:1.2' } }