Skip to content

Composer cleanup and update #137

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.

Sign up for GitHub

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

Merged
tmatsuo merged 4 commits into from
Jul 29, 2016
Merged

Composer cleanup and update #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afd8f69
Composer cleanup and update
Jul 28, 2016
3def95b
Fixed pubsub tests
Jul 28, 2016
e7c223a
Use '^' instead of '~'
Jul 28, 2016
a81b5f0
Fixed the DatastoreHelper, disable Debug
Jul 28, 2016
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
4 changes: 2 additions & 2 deletions appengine/flexible/analytics/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"symfony/css-selector": "^3.1"
},
"require-dev": {
"phpunit/phpunit": "~4",
"google/cloud-tools": "^0.1.0"
"google/cloud-tools": "<=1.0",
Copy link
Contributor

@bshaffer bshaffer Jul 28, 2016

Choose a reason for hiding this comment

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

This goes against semantic versioning, are you sure we don't want to just tag this to a specific version?

Copy link
Contributor Author

@tmatsuo tmatsuo Jul 28, 2016

Choose a reason for hiding this comment

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

I actually want to auto update cloud-tools to the latest until it hits 1.0

"phpunit/phpunit": "~4"
}
}
385 changes: 266 additions & 119 deletions appengine/flexible/analytics/composer.lock
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions appengine/flexible/cloudsql/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"require": {
"silex/silex": "^1.3",
"google/apiclient": "~2.0"
"google/apiclient": "^2.0"
},
"require-dev": {
"phpunit/phpunit": "~4",
"google/cloud-tools": "^0.1.0"
"google/cloud-tools": "<=1.0",
"phpunit/phpunit": "~4"
}
}
215 changes: 108 additions & 107 deletions appengine/flexible/cloudsql/composer.lock
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions appengine/flexible/datastore/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"require": {
"silex/silex": "^1.3",
"google/apiclient": "~2.0"
"google/apiclient": "^2.0"
},
"require-dev": {
"phpunit/phpunit": "~4",
"google/cloud-tools": "^0.1.0"
"google/cloud-tools": "<=1.0",
"phpunit/phpunit": "~4"
}
}
Loading