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

Merge release into master #1828

merged 20 commits into from Nov 26, 2015

Conversation

emanuelez
Copy link
Contributor

No description provided.

@emanuelez
Copy link
Contributor Author

@mc I did the merge again from scrap and fixed the problems I met on the way.

Ready for review @realm/java

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?

@@ -395,8 +399,7 @@ bintray {
}

release {
dependsOn distributionPackage
push = true
push = false
Copy link
Contributor

Choose a reason for hiding this comment

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

How does this work if executed on the build server? Then the change would only be locally there?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We're not ready for the build server yet. In a few iterations this will change.

@cmelchior
Copy link
Contributor

Duplicating the publication info across 5 files looks extremely difficult to maintain, but if it is a temporary solution I guess it is ok.

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.

@@ -1 +1,2 @@
0.86.0-SNAPSHOT
0.85.2-SNAPSHOT
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't this be 0.86.0-SNAPSHOT ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, the release plugin now takes care of the version file. We don't need to touch it anymore :)

Copy link
Contributor

Choose a reason for hiding this comment

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

If the relase plugin takes care of ther version, can we fill it up the blank? I think 0.85.2-SNAPSHOT is little confusing.

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 not sure what you mean @dalinaum

@cmelchior
Copy link
Contributor

👍

emanuelez added a commit that referenced this pull request Nov 26, 2015
@emanuelez emanuelez merged commit 137f563 into master Nov 26, 2015
@emanuelez emanuelez removed the Review label Nov 26, 2015
@emanuelez emanuelez deleted the ez/merge-release-into-master branch November 26, 2015 13:54
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants