Skip to content
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
1 change: 0 additions & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ buildscript {
classpath "com.gradle:gradle-enterprise-gradle-plugin:3.5"
classpath "com.android.tools.build:gradle:4.0.1"
classpath "com.github.ben-manes:gradle-versions-plugin:0.36.0"
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5"
}
}

Expand Down
1 change: 0 additions & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ mavenMajorVersion = 2
mavenMinorVersion = 3
mavenPatchVersion = 1
mavenArtifactSuffix =
nightliesUrl = http://dl.bintray.com/MicrosoftGraph/Maven

#These values are used to run functional tests
#If you wish to run the functional tests, edit the gradle.properties
Expand Down
63 changes: 0 additions & 63 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ plugins {
id 'eclipse'
id 'maven-publish'
id 'signing'
id 'com.jfrog.bintray' version '1.8.5'
id 'jacoco'
}

Expand Down Expand Up @@ -49,9 +48,7 @@ sourceSets {

// In this section you declare where to find the dependencies of your project
repositories {
// Use jcenter for resolving your dependencies.
// You can declare any Maven/Ivy/file repository here.
jcenter()
mavenCentral()
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } // for jacoco, until 0.8.7 gets released
}
Expand Down Expand Up @@ -166,34 +163,6 @@ publishing {
}
}
}

maven {
url = 'http://oss.jfrog.org/artifactory/oss-snapshot-local'
name = 'jfrogSnapshot'

credentials {
if (project.rootProject.file('local.properties').exists()) {
Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())
username = (properties.containsKey('bintray.user')) ? properties.getProperty('bintray.user').toLowerCase() : "BINTRAY_USERNAME"
password = properties.getProperty('bintray.apikey')
}
}
}

maven {
url = 'https://oss.jfrog.org/artifactory/libs-release'
name = 'jfrog'

credentials {
if (project.rootProject.file('local.properties').exists()) {
Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())
username = (properties.containsKey('bintray.user')) ? properties.getProperty('bintray.user').toLowerCase() : "BINTRAY_USERNAME"
password = properties.getProperty('bintray.apikey')
}
}
}
}
}

Expand All @@ -209,38 +178,6 @@ def fixAscNames = { name ->
name.replace('msgraph-sdk-java-core', "${project.property('mavenArtifactId')}-${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}")
}
}
bintray {
if (project.rootProject.file('local.properties').exists()) {
Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())
user = (properties.containsKey('bintray.user')) ? properties.getProperty('bintray.user').toLowerCase() : "BINTRAY_USERNAME"
key = properties.getProperty('bintray.apikey')
}
publications = ['mavenCentralRelease']
filesSpec {
from ('build/libs') {
include 'msgraph-sdk-java-core*.jar.asc'
rename fixAscNames
}
from ('build') {
include 'generated-pom.xml.asc'
rename fixAscNames
}
into "com/microsoft/graph/${project.property('mavenArtifactId')}/${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}/"
}
pkg {
repo = 'Maven'
name = project.property('mavenArtifactId')
userOrg = 'microsoftgraph'
licenses = ['MIT']
vcsUrl = 'https://github.com/microsoftgraph/msgraph-sdk-java-core.git'
publicDownloadNumbers = true
version {
name = "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}"
vcsTag = "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}"
}
}
}

compileJava {
sourceCompatibility = 1.8
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ mavenMajorVersion = 2
mavenMinorVersion = 0
mavenPatchVersion = 0
mavenArtifactSuffix =
nightliesUrl = http://dl.bintray.com/MicrosoftGraph/Maven

#These values are used to run functional tests
#If you wish to run the functional tests, edit the gradle.properties
Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Add the repository and a compile dependency for `microsoft-graph-core` to your p

```gradle
repositories {
jcenter()
mavenCentral()
}

dependencies {
Expand Down