Skip to content
This repository was archived by the owner on Apr 5, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions android-sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
***************************************************************************/

apply plugin: 'com.android.library'
apply plugin: 'maven'
apply plugin: 'maven-publish'
//apply plugin: 'maven'
//apply plugin: 'maven-publish'

version = version_name
group = group_id
Expand Down Expand Up @@ -86,18 +86,18 @@ dependencies {
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:2.9.8"
}

uploadArchives {
dependsOn = [':android-sdk:releaseJavadocJar', ':android-sdk:releaseSourcesJar']
shouldRunAfter = [':android-sdk:clean', ':datafile-handler:uploadArchives', ':event-handler:uploadArchives', ':user-profile:uploadArchives']
repositories {
mavenDeployer {
repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android") {
authentication(userName: bintray_user, password: bintray_api_key)
}
pom.artifactId = "android-sdk"
}
}
}
//uploadArchives {
// dependsOn = [':android-sdk:releaseJavadocJar', ':android-sdk:releaseSourcesJar']
// shouldRunAfter = [':android-sdk:clean', ':datafile-handler:uploadArchives', ':event-handler:uploadArchives', ':user-profile:uploadArchives']
// repositories {
// mavenDeployer {
// repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android") {
// authentication(userName: bintray_user, password: bintray_api_key)
// }
// pom.artifactId = "android-sdk"
// }
// }
//}

android.libraryVariants.all { variant ->
task("${variant.name}Javadoc", type: Javadoc, dependsOn: "assemble${variant.name.capitalize()}") {
Expand Down
40 changes: 23 additions & 17 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,19 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
def bintray_user = System.getenv('BINTRAY_USER')
def bintray_api_key = System.getenv('BINTRAY_API_KEY')
def version_name = System.getenv('TRAVIS_TAG')
if (bintray_user != null && bintray_api_key != null && version_name != null) {
rootProject.ext.bintray_user = bintray_user
rootProject.ext.bintray_api_key = bintray_api_key
rootProject.ext.version_name = version_name
} else {
rootProject.ext.bintray_user = ''
rootProject.ext.bintray_api_key = ''
rootProject.ext.version_name= 'debugVersion'
}
// def bintray_user = System.getenv('BINTRAY_USER')
// def bintray_api_key = System.getenv('BINTRAY_API_KEY')
// def version_name = System.getenv('TRAVIS_TAG')
// if (bintray_user != null && bintray_api_key != null && version_name != null) {
// rootProject.ext.bintray_user = bintray_user
// rootProject.ext.bintray_api_key = bintray_api_key
// rootProject.ext.version_name = version_name
// } else {
// rootProject.ext.bintray_user = ''
// rootProject.ext.bintray_api_key = ''
// rootProject.ext.version_name= 'debugVersion'
// }
rootProject.ext.version_name= '3.1.0-a1'
repositories {
jcenter()
google()
Expand Down Expand Up @@ -63,6 +64,7 @@ ext {
dexmaker_ver = "1.2"
espresso_ver = "2.2.2"
gson_ver = "2.8.5"

group_id = "com.optimizely.ab"
mavPluginVersion = '1.0.3'
mavProjectName = 'optimizely-android-sdk'
Expand All @@ -75,11 +77,11 @@ task clean(type: Delete) {
delete rootProject.buildDir
}

task ship() {
dependsOn(':android-sdk:uploadArchives', ':shared:uploadArchives',
'event-handler:uploadArchives', 'user-profile:uploadArchives',
'datafile-handler:uploadArchives')
}
//task ship() {
// dependsOn(':android-sdk:uploadArchives', ':shared:uploadArchives',
// 'event-handler:uploadArchives', 'user-profile:uploadArchives',
// 'datafile-handler:uploadArchives')
//}

task cleanAllModules () {
logger.info("Running clean for all modules")
Expand All @@ -102,3 +104,7 @@ testAllModulesTravis.dependsOn(':android-sdk:connectedAndroidTest', ':android-sd
':user-profile:connectedAndroidTest', ':shared:connectedAndroidTest')

testAllModules.dependsOn('testAllModulesTravis', ':test-app:connectedAndroidTest')

subprojects {
tasks.withType(Javadoc).all { enabled = false }
}
29 changes: 15 additions & 14 deletions datafile-handler/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
***************************************************************************/

apply plugin: 'com.android.library'
apply plugin: 'maven'
apply plugin: 'maven-publish'
//apply plugin: 'maven'
//apply plugin: 'maven-publish'

version = version_name
group = group_id
Expand Down Expand Up @@ -73,18 +73,18 @@ dependencies {
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:2.9.8"
}

uploadArchives {
dependsOn = [':datafile-handler:releaseJavadocJar', ':datafile-handler:releaseSourcesJar']
shouldRunAfter = [':datafile-handler:clean', ':shared:uploadArchives']
repositories {
mavenDeployer {
repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android-datafile-handler") {
authentication(userName: bintray_user, password: bintray_api_key)
}
pom.artifactId = "android-sdk-datafile-handler"
}
}
}
//uploadArchives {
// dependsOn = [':datafile-handler:releaseJavadocJar', ':datafile-handler:releaseSourcesJar']
// shouldRunAfter = [':datafile-handler:clean', ':shared:uploadArchives']
// repositories {
// mavenDeployer {
// repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android-datafile-handler") {
// authentication(userName: bintray_user, password: bintray_api_key)
// }
// pom.artifactId = "android-sdk-datafile-handler"
// }
// }
//}

android.libraryVariants.all { variant ->
task("${variant.name}Javadoc", type: Javadoc, dependsOn: "assemble${variant.name.capitalize()}") {
Expand Down Expand Up @@ -126,3 +126,4 @@ android.libraryVariants.all { variant ->
project.artifacts.add("archives", tasks["${variant.name}SourcesJar"]);
}

apply from: "https://raw.githubusercontent.com/sky-uk/gradle-maven-plugin/${mavPluginVersion}/gradle-mavenizer.gradle"
29 changes: 15 additions & 14 deletions event-handler/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
***************************************************************************/

apply plugin: 'com.android.library'
apply plugin: 'maven'
apply plugin: 'maven-publish'
//apply plugin: 'maven'
//apply plugin: 'maven-publish'

version = version_name
group = group_id
Expand Down Expand Up @@ -74,18 +74,18 @@ dependencies {
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:2.9.8"
}

uploadArchives {
dependsOn = [':event-handler:releaseJavadocJar', ':event-handler:releaseSourcesJar']
shouldRunAfter = [':event-handler:clean', ':shared:uploadArchives']
repositories {
mavenDeployer {
repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android-event-handler") {
authentication(userName: bintray_user, password: bintray_api_key)
}
pom.artifactId = "android-sdk-event-handler"
}
}
}
//uploadArchives {
// dependsOn = [':event-handler:releaseJavadocJar', ':event-handler:releaseSourcesJar']
// shouldRunAfter = [':event-handler:clean', ':shared:uploadArchives']
// repositories {
// mavenDeployer {
// repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android-event-handler") {
// authentication(userName: bintray_user, password: bintray_api_key)
// }
// pom.artifactId = "android-sdk-event-handler"
// }
// }
//}

android.libraryVariants.all { variant ->
task("${variant.name}Javadoc", type: Javadoc, dependsOn: "assemble${variant.name.capitalize()}") {
Expand Down Expand Up @@ -127,3 +127,4 @@ android.libraryVariants.all { variant ->
project.artifacts.add("archives", tasks["${variant.name}SourcesJar"]);
}

apply from: "https://raw.githubusercontent.com/sky-uk/gradle-maven-plugin/${mavPluginVersion}/gradle-mavenizer.gradle"
30 changes: 16 additions & 14 deletions shared/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
***************************************************************************/

apply plugin: 'com.android.library'
apply plugin: 'maven'
apply plugin: 'maven-publish'
//apply plugin: 'maven'
//apply plugin: 'maven-publish'

version = version_name
group = group_id
Expand Down Expand Up @@ -77,18 +77,18 @@ dependencies {
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:2.9.8"
}

uploadArchives {
dependsOn = [':shared:releaseJavadocJar', ':shared:releaseSourcesJar']
shouldRunAfter = [':shared:clean']
repositories {
mavenDeployer {
repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android-shared") {
authentication(userName: bintray_user, password: bintray_api_key)
}
pom.artifactId = "android-sdk-shared"
}
}
}
//uploadArchives {
// dependsOn = [':shared:releaseJavadocJar', ':shared:releaseSourcesJar']
// shouldRunAfter = [':shared:clean']
// repositories {
// mavenDeployer {
// repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android-shared") {
// authentication(userName: bintray_user, password: bintray_api_key)
// }
// pom.artifactId = "android-sdk-shared"
// }
// }
//}

android.libraryVariants.all { variant ->
task("${variant.name}Javadoc", type: Javadoc, dependsOn: "assemble${variant.name.capitalize()}") {
Expand Down Expand Up @@ -130,3 +130,5 @@ android.libraryVariants.all { variant ->
}
project.artifacts.add("archives", tasks["${variant.name}SourcesJar"]);
}

apply from: "https://raw.githubusercontent.com/sky-uk/gradle-maven-plugin/${mavPluginVersion}/gradle-mavenizer.gradle"
30 changes: 16 additions & 14 deletions user-profile/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
***************************************************************************/

apply plugin: 'com.android.library'
apply plugin: 'maven'
apply plugin: 'maven-publish'
//apply plugin: 'maven'
//apply plugin: 'maven-publish'

version = version_name
group = group_id
Expand Down Expand Up @@ -73,18 +73,18 @@ dependencies {
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:2.9.8"
}

uploadArchives {
dependsOn = [':user-profile:releaseJavadocJar', ':user-profile:releaseSourcesJar']
shouldRunAfter = [':user-profile:clean', ':shared:uploadArchives']
repositories {
mavenDeployer {
repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android-user-profile") {
authentication(userName: bintray_user, password: bintray_api_key)
}
pom.artifactId = "android-sdk-user-profile"
}
}
}
//uploadArchives {
// dependsOn = [':user-profile:releaseJavadocJar', ':user-profile:releaseSourcesJar']
// shouldRunAfter = [':user-profile:clean', ':shared:uploadArchives']
// repositories {
// mavenDeployer {
// repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android-user-profile") {
// authentication(userName: bintray_user, password: bintray_api_key)
// }
// pom.artifactId = "android-sdk-user-profile"
// }
// }
//}

android.libraryVariants.all { variant ->
task("${variant.name}Javadoc", type: Javadoc, dependsOn: "assemble${variant.name.capitalize()}") {
Expand Down Expand Up @@ -125,3 +125,5 @@ android.libraryVariants.all { variant ->
}
project.artifacts.add("archives", tasks["${variant.name}SourcesJar"]);
}

apply from: "https://raw.githubusercontent.com/sky-uk/gradle-maven-plugin/${mavPluginVersion}/gradle-mavenizer.gradle"