New release version 1.2.0 (#37)

* Mew release version 1.2.0. Upgraded to retroswagger 1.1.0. And changed org to Adevinta.

* changed dist to trusty

* Updated changelog

* Updated tests

Author: ferranpons

.github/CONTRIBUTING.md

@@ -6,7 +6,7 @@ If you would like to contribute code you can do so through GitHub by forking the
 When submitting code, please make every effort to follow existing conventions and style in order to keep the code as readable as possible.
 
 1. Create an issue to discuss about your idea
-2. [Fork it] (https://github.com/SchibstedSpain/protein/fork)
+2. [Fork it] (https://github.com/AdevintaSpain/protein/fork)
 3. Create your feature branch (`git checkout -b my-new-feature`)
 4. Commit your changes (`git commit -am 'Add some feature'`)
 5. Push to the branch (`git push origin my-new-feature`)

.travis.yml

@@ -1,4 +1,5 @@
 language: java
+dist: trusty
 jdk:
   - oraclejdk8
 

CHANGELOG.md

@@ -1 +1,2 @@
-Removed `/` from the beginning of annotation paths 
+Upgraded Retroswagger to version 1.1.0 that uses the latest version of Kotlinpoet (1.3.0).
+Also we have raised IDE compatibility version.

LICENSE.md

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2016 Schibsted Classified Media Spain S.L.
+   Copyright 2016 Adevinta Spain S.L.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Protein.ipr

@@ -1,7 +1,7 @@
 <!--
   Title: Protein - Kotlin code generator for Retrofit2 and RxJava2 based on Swagger
   Description: Protein is a plugin for intelliJ that automates the build of "Agents" for Android in Kotlin. It generates the code for Retrofit based on a Swagger endpoint.
-  Author: SchibstedSpain
+  Author: AdevintaSpain
   -->
 
 <img src="media/protein_logo.png" align="left" height="128px" />
@@ -40,14 +40,14 @@ Protein is a plugin for intelliJ that automates the build of Retrofit "Interface
 
 
 This scientific definition defines quite good the objective of this Plugin in an abstract way.
-For many time at Schibsted Spain we struggled with the idea of making a good and maintainable architecture for Android.
+For many time at Adevinta Spain we struggled with the idea of making a good and maintainable architecture for Android.
 It's been some time until we got one that fits with our needs but we still have a lot of errors and issues that human beings do every time we make manual work.
 That's were we came to the idea of automatization and make new components with all we need.
 
 Protein is our approach to work better, be more productive and reliable.
 
 
-*<b>NOTE:</b> Protein is based on the library [Retroswagger](https://github.com/SchibstedSpain/Retroswagger) that is the core for the kotlin builder that parses swagger json and generates the kotlin code.*
+*<b>NOTE:</b> Protein is based on the library [Retroswagger](https://github.com/AdevintaSpain/Retroswagger) that is the core for the kotlin builder that parses swagger json and generates the kotlin code.*
 
 ### Features
 
@@ -279,7 +279,7 @@ or you can check: [https://plugins.jetbrains.com/plugin/10206-protein--android-c
 
 1. If you want to build it locally you need download the latest version of IntelliJ Community
 [https://www.jetbrains.com/idea/download/#section=mac](https://www.jetbrains.com/idea/download/#section=mac)
-2. Clone this repository ([email protected]:SchibstedSpain/protein.git)
+2. Clone this repository ([email protected]:AdevintaSpain/protein.git)
 3. Execute "RunIdea" gradle task
 
 Who made this
@@ -306,7 +306,7 @@ Contribute
 ----------
 
 1. Create an issue to discuss about your idea
-2. [Fork it] (https://github.com/SchibstedSpain/protein/fork)
+2. [Fork it] (https://github.com/AdevintaSpain/protein/fork)
 3. Create your feature branch (`git checkout -b my-new-feature`)
 4. Commit your changes (`git commit -am 'Add some feature'`)
 5. Push to the branch (`git push origin my-new-feature`)
@@ -317,13 +317,13 @@ Contribute
 Bugs and Feedback
 -----------------
 
-For bugs, questions and discussions please use the [Github Issues](https://github.com/SchibstedSpain/protein/issues).
+For bugs, questions and discussions please use the [Github Issues](https://github.com/AdevintaSpain/protein/issues).
 
 
 License
 -------
 
-Copyright 2018 Schibsted Classified Media Spain S.L.
+Copyright 2018 Adevinta Spain S.L.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.md

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.21'
+    ext.kotlin_version = '1.3.50'
 
     repositories {
         mavenCentral()
@@ -67,7 +67,7 @@ sourceCompatibility = 1.8
 group 'com.schibsted.protein'
 version buildVersion
 
-def intelliJVersion = 'IC-183.4588.61'
+def intelliJVersion = '192.6603.28'
 def sinceVersion = '172.0'
 
 intellij {
@@ -82,7 +82,7 @@ publish {
     artifactId = 'protein'
     publishVersion = "${buildVersion}"
     desc = 'Protein is a plugin for intelliJ that automates the build of "Agents" for Android in Kotlin. It generates the code for Retrofit based on a Swagger endpoint.'
-    website = 'https://github.com/SchibstedSpain/protein'
+    website = 'https://github.com/AdevintaSpain/protein'
 }
 
 publishPlugin {
@@ -134,10 +134,9 @@ ktlint {
 }
 
 dependencies {
-    compile 'com.squareup:kotlinpoet:1.0.0-RC2'
     compile "io.reactivex.rxjava2:rxjava:2.1.16"
     compile 'com.squareup.retrofit2:retrofit:2.4.0'
-    compile "com.schibsted.spain:retroswagger:1.0.0"
+    compile "com.schibsted.spain:retroswagger:1.1.0"
 
     def jacksonVersion = '2.8.4'
     compile "com.fasterxml.jackson.core:jackson-core:$jacksonVersion"
@@ -168,7 +167,7 @@ dependencies {
     testCompile 'org.jetbrains.kotlin:kotlin-test-junit:1.1.3-2'
     testCompile 'org.mockito:mockito-core:1.10.19'
     testCompile 'junit:junit:4.12'
-    testCompile "com.schibsted.spain:retroswagger:1.0.0"
+    testCompile "com.schibsted.spain:retroswagger:1.1.0"
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
 }
 compileKotlin {

build.gradle

@@ -11,7 +11,7 @@ <h3 id="background">Background</h3><br/>
 </blockquote>
 
 <p>This scientific definition defines quite good the objective of this Plugin in an abstract way.
-    For many time at <a href="http://www.schibsted.es">Schibsted Spain</a> we struggled with the idea of making a good and maintainable architecture for Android.
+    For many time at <a href="http://www.adevinta.com">Adevinta Spain</a> we struggled with the idea of making a good and maintainable architecture for Android.
     It's been some time until we got one that fits with our needs but we still have a lot of errors and issues that human beings do every time we make manual work.
     That's were we came to the idea of automatization and make new components with all we need including tests, data sources even use cases and Presenters.</p>
 

media/plugin_description.html

@@ -29,10 +29,10 @@ class ProteinUpdateComponent(project: Project) : AbstractProjectComponent(projec
     <br/>
     Thank you for downloading <b>Protein</b>!<br>
     If you find this plugin helpful,
-    <b><a href="https://github.com/SchibstedSpain/Protein">
+    <b><a href="https://github.com/AdevintaSpain/Protein">
     Please give us a star on Github</a></b><br/>
-    If you find any issue, <b><a href="https://github.com/SchibstedSpain/Protein/issues/new/choose">Feel free to raise a issue</a></b><br/>
-    See <b><a href="https://github.com/SchibstedSpain/Protein/blob/master/CHANGELOG.md">Changelog</a></b>
+    If you find any issue, <b><a href="https://github.com/AdevintaSpain/Protein/issues/new/choose">Feel free to raise a issue</a></b><br/>
+    See <b><a href="https://github.com/AdevintaSpain/Protein/blob/master/CHANGELOG.md">Changelog</a></b>
     for more details.
     """
 

src/main/kotlin/protein/ide/component/ProteinUpdateComponent.kt

@@ -1,8 +1,8 @@
 <idea-plugin>
   <id>com.schibsted.protein</id>
   <name>Protein - Kotlin code generator for Retrofit2 and RxJava2 based on Swagger</name>
-  <version>1.1.3</version>
-  <vendor email="ferran.pons@schibsted.com" url="http://www.schibsted.es">Schibsted Spain</vendor>
+  <version>1.2.0</version>
+  <vendor email="ferran.pons@adevinta.com" url="http://www.adevinta.com">Adevinta Spain</vendor>
 
   <description><![CDATA[
 
@@ -12,7 +12,7 @@
     It generates the Kotlin code for Retrofit based on a Swagger schema endpoint.
     This plugin only allows you to create an API Rest Interface and the Models for Retrofit 2 and RxJava 2.</p>
 
-<p>For many time at <a href="http://www.schibsted.es">Schibsted Spain</a> we struggled with the idea of making a good and maintainable architecture for Android.
+<p>For many time at <a href="http://www.adevinta.com">Adevinta Spain</a> we struggled with the idea of making a good and maintainable architecture for Android.
     It's been some time until we got one that fits with our needs but we still have a lot of errors and issues that human beings do every time we make manual work.
     That's were we came to the idea of automatization and make new components with all we need including tests and data sources.</p>
 
@@ -42,7 +42,8 @@
     ]]></description>
 
   <change-notes><![CDATA[
-      Removed `/` from the beginning of annotation paths
+      Upgraded Retroswagger to version 1.1.0 that uses the latest version of Kotlinpoet (1.3.0).
+      Also we have raised IDE compatibility version
     ]]>
   </change-notes>
 

src/main/resources/META-INF/plugin.xml

@@ -49,41 +49,41 @@ class KotlinApiBuilderShould {
     kotlinApiBuilder.build()
     assertEquals("",
         "package com.mycompany.mylibrary\n" +
-            "\n" +
-            "import io.reactivex.Completable\n" +
-            "import io.reactivex.Single\n" +
-            "import retrofit2.http.DELETE\n" +
-            "import retrofit2.http.GET\n" +
-            "import retrofit2.http.PUT\n" +
-            "import retrofit2.http.Path\n" +
-            "\n" +
-            "interface componentNameApiInterface {\n" +
-            "    /**\n" +
-            "     * Get all favorites for this user\n" +
-            "     *\n" +
-            "     * @param Authorization Authorization\n" +
-            "     */\n" +
-            "    @GET(\"favorites\")\n" +
-            "    fun getFavorites(): Single<GetFavoritesResponse>\n" +
-            "\n" +
-            "    /**\n" +
-            "     * Save favorite\n" +
-            "     *\n" +
-            "     * @param adId adId\n" +
-            "     * @param Authorization Authorization\n" +
-            "     */\n" +
-            "    @PUT(\"favorites/{adId}\")\n" +
-            "    fun saveFavorite(@Path(\"adId\") adId: String): Completable\n" +
-            "\n" +
-            "    /**\n" +
-            "     * Delete favorite\n" +
-            "     *\n" +
-            "     * @param adId adId\n" +
-            "     * @param Authorization Authorization\n" +
-            "     */\n" +
-            "    @DELETE(\"favorites/{adId}\")\n" +
-            "    fun deleteFavorite(@Path(\"adId\") adId: String): Completable\n" +
-            "}\n",
+          "\n" +
+          "import io.reactivex.Completable\n" +
+          "import io.reactivex.Single\n" +
+          "import retrofit2.http.DELETE\n" +
+          "import retrofit2.http.GET\n" +
+          "import retrofit2.http.PUT\n" +
+          "import retrofit2.http.Path\n" +
+          "\n" +
+          "interface componentNameApiInterface {\n" +
+          "  /**\n" +
+          "   * Get all favorites for this user\n" +
+          "   *\n" +
+          "   * @param Authorization Authorization\n" +
+          "   */\n" +
+          "  @GET(\"favorites\")\n" +
+          "  fun getFavorites(): Single<GetFavoritesResponse>\n" +
+          "\n" +
+          "  /**\n" +
+          "   * Save favorite\n" +
+          "   *\n" +
+          "   * @param adId adId\n" +
+          "   * @param Authorization Authorization\n" +
+          "   */\n" +
+          "  @PUT(\"favorites/{adId}\")\n" +
+          "  fun saveFavorite(@Path(\"adId\") adId: String): Completable\n" +
+          "\n" +
+          "  /**\n" +
+          "   * Delete favorite\n" +
+          "   *\n" +
+          "   * @param adId adId\n" +
+          "   * @param Authorization Authorization\n" +
+          "   */\n" +
+          "  @DELETE(\"favorites/{adId}\")\n" +
+          "  fun deleteFavorite(@Path(\"adId\") adId: String): Completable\n" +
+          "}\n",
       getGeneratedApiInterfaceString(kotlinApiBuilder.getGeneratedApiInterfaceTypeSpec()))
   }