Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release into master #1828

Merged
merged 20 commits into from
Nov 26, 2015
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4063a63
Prepare for release
emanuelez Nov 19, 2015
b793276
Release v0.85.0
emanuelez Nov 19, 2015
13a5495
Release 0.85.0
emanuelez Nov 23, 2015
0b6fcff
Include dependency for the annotation processor
emanuelez Nov 23, 2015
7923bdb
Buffer overwritten caused PK migration failure
beeender Nov 23, 2015
e69515d
Merge pull request #1816 from realm/mc/bug/1775
beeender Nov 24, 2015
cd87ff1
Include dependency to the annotation for the AP
emanuelez Nov 24, 2015
68af6d8
Prepare next release v0.85.2-SNAPSHOT
emanuelez Nov 24, 2015
dc5530d
Be specific about the javadoc version to include
emanuelez Nov 25, 2015
30187ff
The distribution package depends on the eclipse Jar
emanuelez Nov 25, 2015
ef31747
Fix the name of the gradle plugin artifact
emanuelez Nov 25, 2015
8a27403
Merge branch 'release/0.85' into ez/merge-release-into-master
emanuelez Nov 25, 2015
b4f986d
rename the Aar artifact
emanuelez Nov 25, 2015
a218512
Merge branch 'release/0.85' into ez/merge-release-into-master
emanuelez Nov 25, 2015
20d157b
Fix the build file of the examples
emanuelez Nov 25, 2015
5cfd4a1
Merge branch 'release/0.85' into ez/merge-release-into-master
emanuelez Nov 25, 2015
c6dcf32
Include bintray operations in the main gradle file
emanuelez Nov 26, 2015
da7f4ee
Merge branch 'release/0.85' into ez/merge-release-into-master
emanuelez Nov 26, 2015
3867555
Don’t use the bintray plugin when not needed
emanuelez Nov 26, 2015
6f94218
Merge branch 'release/0.85' into ez/merge-release-into-master
emanuelez Nov 26, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
126 changes: 126 additions & 0 deletions bintrayAar.gradle
@@ -0,0 +1,126 @@
buildscript {
repositories {
jcenter()
}
dependencies {
//classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this line?

classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
}
}

apply plugin: 'maven-publish'
apply plugin: 'com.jfrog.bintray'

def currentVersion = file("${projectDir}/version.txt").text.trim();

version = currentVersion

def commonPom = {
version = currentVersion
licenses {
license {
name 'The Apache Software License, Version 2.0'
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
distribution 'repo'
}
}
issueManagement {
system 'github'
url 'https://github.com/realm/realm-java/issues'
}
scm {
url 'scm:https://github.com/realm/realm-java'
connection 'scm:git@github.com:realm/realm-java.git'
developerConnection 'scm:git@github.com:realm/realm-java.git'
}
}

publishing {
publications {
jarLibrary(MavenPublication) {
groupId 'io.realm'
artifactId = 'realm-android'
artifact file("${buildDir}/outputs/gradle/realm-android-${currentVersion}.jar")
//artifact file("${rootDir}/realm/realm-library/build/libs/realm-android-${currentVersion}-sources.jar")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove out commented code

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm keeping those as a reminder to find a way to import them again.

//artifact file("${rootDir}/realm/realm-library/build/libs/realm-android-${currentVersion}-javadoc.jar")
pom.withXml {
Node root = asNode()
root.appendNode('name', 'realm-android')
root.appendNode('description', 'Realm is a mobile database: a replacement for SQLite & ORMs.')
root.appendNode('url', 'http://realm.io')
root.children().last() + commonPom
}
}
aarLibrary(MavenPublication) {
groupId 'io.realm'
artifactId = 'realm-android-library'
artifact file("${rootDir}/realm/realm-library/build/outputs/aar/realm-library-release.aar")
//artifact file("${rootDir}/realm/realm-library/build/libs/realm-android-${currentVersion}-sources.jar")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same

//artifact file("${rootDir}/realm/realm-library/build/libs/realm-android-${currentVersion}-javadoc.jar")
pom.withXml {
Node root = asNode()
root.appendNode('name', 'realm-android-library')
root.appendNode('description', 'Realm is a mobile database: a replacement for SQLite & ORMs.')
root.appendNode('url', 'http://realm.io')
root.children().last() + commonPom
}
}
annotations(MavenPublication) {
groupId 'io.realm'
artifactId = 'realm-annotations'
artifact file("${rootDir}/realm/realm-annotations/build/libs/realm-annotations-${currentVersion}.jar")
pom.withXml {
Node root = asNode()
root.appendNode('name', 'realm-annotations')
root.appendNode('description', 'Annotations for Realm. Realm is a mobile database: a replacement for SQLite & ORMs')
root.appendNode('url', 'http://realm.io')
root.children().last() + commonPom
}
}
annotationsProcessor(MavenPublication) {
groupId 'io.realm'
artifactId = 'realm-annotations-processor'
artifact file("${rootDir}/realm/realm-annotations-processor/build/libs/realm-annotations-processor-${currentVersion}.jar")
pom.withXml {
Node root = asNode()
root.appendNode('name', 'realm-annotations-processor')
root.appendNode('description', 'Annotation Processor for Realm. Realm is a mobile database: a replacement for SQLite & ORMs')
root.appendNode('url', 'http://realm.io')
root.children().last() + commonPom
}
}
gradlePlugin(MavenPublication) {
groupId 'io.realm'
artifactId = 'realm-gradle-plugin'
artifact file("${rootDir}/gradle-plugin/build/libs/gradle-plugin-${currentVersion}.jar")
pom.withXml {
Node root = asNode()
root.appendNode('name', 'gradle-realm-plugin')
root.appendNode('description', 'Gradle plugin for Realm. Realm is a mobile database: a replacement for SQLite & ORMs.')
root.appendNode('url', 'http://realm.io')
root.children().last() + commonPom
}
}
}
}

bintray {
user = project.hasProperty('bintrayUser') ? bintrayUser : 'noUser'
key = project.hasProperty('bintrayKey') ? bintrayKey : 'noKey'

dryRun = false
publish = false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to manually publish all of these?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the moment, yes. When automation kick in, not anymore.


publications = ['aarLibrary']
pkg {
repo = 'maven'
name = 'realm-android-library'
desc = 'Realm for Android'
websiteUrl = 'http://realm.io'
issueTrackerUrl = 'https://github.com/realm/realm-java/issues'
vcsUrl = 'https://github.com/realm/realm-java.git'
licenses = ['Apache-2.0']
labels = ['android', 'realm']
publicDownloadNumbers = false
}
}
126 changes: 126 additions & 0 deletions bintrayAnnotations.gradle
@@ -0,0 +1,126 @@
buildscript {
repositories {
jcenter()
}
dependencies {
//classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can it be removed?

classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
}
}

apply plugin: 'maven-publish'
apply plugin: 'com.jfrog.bintray'

def currentVersion = file("${projectDir}/version.txt").text.trim();

version = currentVersion

def commonPom = {
version = currentVersion
licenses {
license {
name 'The Apache Software License, Version 2.0'
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
distribution 'repo'
}
}
issueManagement {
system 'github'
url 'https://github.com/realm/realm-java/issues'
}
scm {
url 'scm:https://github.com/realm/realm-java'
connection 'scm:git@github.com:realm/realm-java.git'
developerConnection 'scm:git@github.com:realm/realm-java.git'
}
}

publishing {
publications {
jarLibrary(MavenPublication) {
groupId 'io.realm'
artifactId = 'realm-android'
artifact file("${buildDir}/outputs/gradle/realm-android-${currentVersion}.jar")
//artifact file("${rootDir}/realm/realm-library/build/libs/realm-android-${currentVersion}-sources.jar")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove?

//artifact file("${rootDir}/realm/realm-library/build/libs/realm-android-${currentVersion}-javadoc.jar")
pom.withXml {
Node root = asNode()
root.appendNode('name', 'realm-android')
root.appendNode('description', 'Realm is a mobile database: a replacement for SQLite & ORMs.')
root.appendNode('url', 'http://realm.io')
root.children().last() + commonPom
}
}
aarLibrary(MavenPublication) {
groupId 'io.realm'
artifactId = 'realm-android-library'
artifact file("${rootDir}/realm/realm-library/build/outputs/aar/realm-library-release.aar")
//artifact file("${rootDir}/realm/realm-library/build/libs/realm-android-${currentVersion}-sources.jar")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove?

//artifact file("${rootDir}/realm/realm-library/build/libs/realm-android-${currentVersion}-javadoc.jar")
pom.withXml {
Node root = asNode()
root.appendNode('name', 'realm-android-library')
root.appendNode('description', 'Realm is a mobile database: a replacement for SQLite & ORMs.')
root.appendNode('url', 'http://realm.io')
root.children().last() + commonPom
}
}
annotations(MavenPublication) {
groupId 'io.realm'
artifactId = 'realm-annotations'
artifact file("${rootDir}/realm/realm-annotations/build/libs/realm-annotations-${currentVersion}.jar")
pom.withXml {
Node root = asNode()
root.appendNode('name', 'realm-annotations')
root.appendNode('description', 'Annotations for Realm. Realm is a mobile database: a replacement for SQLite & ORMs')
root.appendNode('url', 'http://realm.io')
root.children().last() + commonPom
}
}
annotationsProcessor(MavenPublication) {
groupId 'io.realm'
artifactId = 'realm-annotations-processor'
artifact file("${rootDir}/realm/realm-annotations-processor/build/libs/realm-annotations-processor-${currentVersion}.jar")
pom.withXml {
Node root = asNode()
root.appendNode('name', 'realm-annotations-processor')
root.appendNode('description', 'Annotation Processor for Realm. Realm is a mobile database: a replacement for SQLite & ORMs')
root.appendNode('url', 'http://realm.io')
root.children().last() + commonPom
}
}
gradlePlugin(MavenPublication) {
groupId 'io.realm'
artifactId = 'realm-gradle-plugin'
artifact file("${rootDir}/gradle-plugin/build/libs/gradle-plugin-${currentVersion}.jar")
pom.withXml {
Node root = asNode()
root.appendNode('name', 'gradle-realm-plugin')
root.appendNode('description', 'Gradle plugin for Realm. Realm is a mobile database: a replacement for SQLite & ORMs.')
root.appendNode('url', 'http://realm.io')
root.children().last() + commonPom
}
}
}
}

bintray {
user = project.hasProperty('bintrayUser') ? bintrayUser : 'noUser'
key = project.hasProperty('bintrayKey') ? bintrayKey : 'noKey'

dryRun = false
publish = false

publications = ['annotations']
pkg {
repo = 'maven'
name = 'realm-annotations'
desc = 'Realm for Android'
websiteUrl = 'http://realm.io'
issueTrackerUrl = 'https://github.com/realm/realm-java/issues'
vcsUrl = 'https://github.com/realm/realm-java.git'
licenses = ['Apache-2.0']
labels = ['android', 'realm']
publicDownloadNumbers = false
}
}
131 changes: 131 additions & 0 deletions bintrayAnnotationsProcessor.gradle
@@ -0,0 +1,131 @@
buildscript {
repositories {
jcenter()
}
dependencies {
//classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove

classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
}
}

apply plugin: 'maven-publish'
apply plugin: 'com.jfrog.bintray'

def currentVersion = file("${projectDir}/version.txt").text.trim();

version = currentVersion

def commonPom = {
version = currentVersion
licenses {
license {
name 'The Apache Software License, Version 2.0'
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
distribution 'repo'
}
}
issueManagement {
system 'github'
url 'https://github.com/realm/realm-java/issues'
}
scm {
url 'scm:https://github.com/realm/realm-java'
connection 'scm:git@github.com:realm/realm-java.git'
developerConnection 'scm:git@github.com:realm/realm-java.git'
}
}

publishing {
publications {
jarLibrary(MavenPublication) {
groupId 'io.realm'
artifactId = 'realm-android'
artifact file("${buildDir}/outputs/gradle/realm-android-${currentVersion}.jar")
//artifact file("${rootDir}/realm/realm-library/build/libs/realm-android-${currentVersion}-sources.jar")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove

//artifact file("${rootDir}/realm/realm-library/build/libs/realm-android-${currentVersion}-javadoc.jar")
pom.withXml {
Node root = asNode()
root.appendNode('name', 'realm-android')
root.appendNode('description', 'Realm is a mobile database: a replacement for SQLite & ORMs.')
root.appendNode('url', 'http://realm.io')
root.children().last() + commonPom
}
}
aarLibrary(MavenPublication) {
groupId 'io.realm'
artifactId = 'realm-android-library'
artifact file("${rootDir}/realm/realm-library/build/outputs/aar/realm-library-release.aar")
//artifact file("${rootDir}/realm/realm-library/build/libs/realm-android-${currentVersion}-sources.jar")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove

//artifact file("${rootDir}/realm/realm-library/build/libs/realm-android-${currentVersion}-javadoc.jar")
pom.withXml {
Node root = asNode()
root.appendNode('name', 'realm-android-library')
root.appendNode('description', 'Realm is a mobile database: a replacement for SQLite & ORMs.')
root.appendNode('url', 'http://realm.io')
root.children().last() + commonPom
}
}
annotations(MavenPublication) {
groupId 'io.realm'
artifactId = 'realm-annotations'
artifact file("${rootDir}/realm/realm-annotations/build/libs/realm-annotations-${currentVersion}.jar")
pom.withXml {
Node root = asNode()
root.appendNode('name', 'realm-annotations')
root.appendNode('description', 'Annotations for Realm. Realm is a mobile database: a replacement for SQLite & ORMs')
root.appendNode('url', 'http://realm.io')
root.children().last() + commonPom
}
}
annotationsProcessor(MavenPublication) {
groupId 'io.realm'
artifactId = 'realm-annotations-processor'
artifact file("${rootDir}/realm/realm-annotations-processor/build/libs/realm-annotations-processor-${currentVersion}.jar")
pom.withXml {
Node root = asNode()
root.appendNode('name', 'realm-annotations-processor')
root.appendNode('description', 'Annotation Processor for Realm. Realm is a mobile database: a replacement for SQLite & ORMs')
root.appendNode('url', 'http://realm.io')
def dependenciesNode = root.appendNode('dependencies')
def dependencyNode = dependenciesNode.appendNode('dependency')
dependencyNode.appendNode('groupId', 'com.squareup')
dependencyNode.appendNode('artifactId', 'javawriter')
dependencyNode.appendNode('version', '2.5.0')
root.children().last() + commonPom
}
}
gradlePlugin(MavenPublication) {
groupId 'io.realm'
artifactId = 'realm-gradle-plugin'
artifact file("${rootDir}/gradle-plugin/build/libs/gradle-plugin-${currentVersion}.jar")
pom.withXml {
Node root = asNode()
root.appendNode('name', 'gradle-realm-plugin')
root.appendNode('description', 'Gradle plugin for Realm. Realm is a mobile database: a replacement for SQLite & ORMs.')
root.appendNode('url', 'http://realm.io')
root.children().last() + commonPom
}
}
}
}

bintray {
user = project.hasProperty('bintrayUser') ? bintrayUser : 'noUser'
key = project.hasProperty('bintrayKey') ? bintrayKey : 'noKey'

dryRun = false
publish = false

publications = ['annotationsProcessor']
pkg {
repo = 'maven'
name = 'realm-annotations-processor'
desc = 'Realm for Android'
websiteUrl = 'http://realm.io'
issueTrackerUrl = 'https://github.com/realm/realm-java/issues'
vcsUrl = 'https://github.com/realm/realm-java.git'
licenses = ['Apache-2.0']
labels = ['android', 'realm']
publicDownloadNumbers = false
}
}