Skip to content

Update retrofit2 and retrofit2rx to use retrofit 2.0.1 #2479

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

Merged
merged 4 commits into from
Apr 28, 2016

Conversation

kungfoo
Copy link
Contributor

@kungfoo kungfoo commented Mar 31, 2016

We need the updated libs, so I thought I'd cherrypick to your version.

@wing328 wing328 added this to the v2.2.0 milestone Mar 31, 2016
@kungfoo
Copy link
Contributor Author

kungfoo commented Mar 31, 2016

The samples are not updated automatically, so I'll still have to add that. Right?

@wing328
Copy link
Contributor

wing328 commented Apr 1, 2016

Here are some errors reported in the CI:

[ERROR] /home/travis/build/swagger-api/swagger-codegen/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java:[19,22] error: package com.google.gson does not exist
[ERROR] /home/travis/build/swagger-api/swagger-codegen/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java:[20,22] error: package com.google.gson does not exist
[ERROR] /home/travis/build/swagger-api/swagger-codegen/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java:[21,22] error: package com.google.gson does not exist
[ERROR] /home/travis/build/swagger-api/swagger-codegen/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java:[310,17] error: cannot find symbol
[ERROR] 
    T extends Object declared in class GsonResponseBodyConverterToString
/home/travis/build/swagger-api/swagger-codegen/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java:[313,37] error: cannot find symbol
[ERROR] 
    T extends Object declared in class GsonResponseBodyConverterToString
/home/travis/build/swagger-api/swagger-codegen/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java:[331,49] error: cannot find symbol
[ERROR]  class GsonCustomConverterFactory
/home/travis/build/swagger-api/swagger-codegen/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java:[335,17] error: cannot find symbol
[ERROR]  class GsonCustomConverterFactory
/home/travis/build/swagger-api/swagger-codegen/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java:[336,17] error: cannot find symbol
[ERROR]  class GsonCustomConverterFactory
/home/travis/build/swagger-api/swagger-codegen/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java:[338,38] error: cannot find symbol

Maybe you forgot to add some new files?

@kungfoo
Copy link
Contributor Author

kungfoo commented Apr 1, 2016

Hmm, since I've cherry picked the change, I probably missed one of the libs
when resolving conflicts. I'll look into it once I get to the office.

On Fri, 1 Apr 2016, 06:14 wing328, notifications@github.com wrote:

Here are some errors reported in the CI:

[ERROR] /home/travis/build/swagger-api/swagger-codegen/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java:[19,22] error: package com.google.gson does not exist
[ERROR] /home/travis/build/swagger-api/swagger-codegen/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java:[20,22] error: package com.google.gson does not exist
[ERROR] /home/travis/build/swagger-api/swagger-codegen/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java:[21,22] error: package com.google.gson does not exist
[ERROR] /home/travis/build/swagger-api/swagger-codegen/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java:[310,17] error: cannot find symbol
[ERROR]
T extends Object declared in class GsonResponseBodyConverterToString
/home/travis/build/swagger-api/swagger-codegen/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java:[313,37] error: cannot find symbol
[ERROR]
T extends Object declared in class GsonResponseBodyConverterToString
/home/travis/build/swagger-api/swagger-codegen/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java:[331,49] error: cannot find symbol
[ERROR] class GsonCustomConverterFactory
/home/travis/build/swagger-api/swagger-codegen/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java:[335,17] error: cannot find symbol
[ERROR] class GsonCustomConverterFactory
/home/travis/build/swagger-api/swagger-codegen/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java:[336,17] error: cannot find symbol
[ERROR] class GsonCustomConverterFactory
/home/travis/build/swagger-api/swagger-codegen/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java:[338,38] error: cannot find symbol

Maybe you forgot to add some new files?


You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub
#2479 (comment)

@wing328
Copy link
Contributor

wing328 commented Apr 1, 2016

@kungfoo please take your time. Stable release v2.1.6 will be out soon so this change will go into the master after that.

@kungfoo kungfoo force-pushed the feature/update-mainline-retrofit branch from 3a321df to 9bf2d3d Compare April 1, 2016 09:11
@wing328
Copy link
Contributor

wing328 commented Apr 9, 2016

@kungfoo when you've time, would you please perform a rebase on the latest master?

@kungfoo
Copy link
Contributor Author

kungfoo commented Apr 9, 2016

Will do. I might get to do it tomorrow...
On 9 Apr 2016 12:29, "wing328" notifications@github.com wrote:

@kungfoo https://github.com/kungfoo when you've time, would you please
perform a rebase on the latest master?


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#2479 (comment)

@kungfoo kungfoo force-pushed the feature/update-mainline-retrofit branch from 9bf2d3d to f528ee6 Compare April 26, 2016 12:30
@kungfoo
Copy link
Contributor Author

kungfoo commented Apr 26, 2016

Rebased unto master.

oltu_version = "1.0.1"
retrofit_version = "2.0.0-beta4"
gson_version = "2.6.2"
oltu_version = "1.0.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

for oltu, shall we use 1.0.1 instead of 1.0.0?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Does not really matter to me. I can change it.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes please. We want to upgrade the dependencies to the latest version after stable releases.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will do asap.

On Wed, Apr 27, 2016 at 8:14 AM, wing328 notifications@github.com wrote:

In
modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
#2479 (comment)
:

@@ -94,9 +94,8 @@ if(hasProperty('target') && target == 'android') {
}

ext {

  • oltu_version = "1.0.1"
  • retrofit_version = "2.0.0-beta4"
  • gson_version = "2.6.2"
  • oltu_version = "1.0.0"

Yes please. We want to upgrade the dependencies to the latest version
after stable releases.


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
https://github.com/swagger-api/swagger-codegen/pull/2479/files/f528ee62c911a26f860dbc1d7878ee87a0f4778b#r61208586

Copy link
Contributor

Choose a reason for hiding this comment

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

Please take your time :)

@kungfoo kungfoo force-pushed the feature/update-mainline-retrofit branch from f528ee6 to 39c08b2 Compare April 27, 2016 08:04
@wing328 wing328 merged commit f1ba6f5 into swagger-api:master Apr 28, 2016
@wing328
Copy link
Contributor

wing328 commented Apr 28, 2016

@kungfoo thanks for the PR, which has been merged into master.

zhenjun115 pushed a commit to zhenjun115/swagger-codegen that referenced this pull request May 8, 2016
…e-retrofit

Update retrofit2 and retrofit2rx to use retrofit 2.0.1
@cbornet
Copy link
Contributor

cbornet commented Jun 8, 2016

All the tests have been deleted !!

@wing328
Copy link
Contributor

wing328 commented Jun 8, 2016

@cbornet you're right. That's my oversight. I'll add them back with a PR

@cbornet
Copy link
Contributor

cbornet commented Jun 8, 2016

Please wait ! I'm doing a PR to add them and some modifs

@wing328
Copy link
Contributor

wing328 commented Jun 8, 2016

@cbornet Saw your PR and will merge it into master later.

@wing328
Copy link
Contributor

wing328 commented Jun 8, 2016

Ref: #3083

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants