Fix maven publication (#12)

pietrini · anthonyroux · web-flow · commit 8e04fafa1794 · 2020-04-13T17:09:10.000+02:00
* Update resources strings for api initialization * Update Android Studio * Update app demo string resources values names * Expose moshi in BaseApi to be able to provide raw string post endpoints * Fix SeatMaps endpoints missing and add post methods by object and string * Rework Builder to hide empty constructor, and provide the possibility to initialize it without having to set credentials * Use new internal builder constructor and fix tests * Add tests for seatmap by id * Update ReadMe * Fix missing credentials for lib compilation * Deployment (#9) * Prepare deployment * Prepare deployment * Replace double quotes by simple quote in build.gradle * Remove comment in deployment file * Fix error in build.gradle * change build command in travis * Add call in documentation * Add pricing api * Fix #1 delete old apis (cherry picked from commit 728c4b0) * Move gradle.properties * Update publish.gradle script * update publish and conf * Move lib to amadeus-android to reflect project name on artifact. Add modules sources to artifact sources. Build javadoc with dokka (javadoc from modules missing for now). * Fix sources type * Fix artifacts publishing issues * Fix missing archives configuration * Remove configurations from bintray * configure travis ci * #4 - Add pricing post missing * #4 - Fix predictions delay api * Add missing co2 property * #4 - Add missing delete * #4 - Add missing post flight orders * fix format of the source archive from aar to jar * Rename Result class in ApiResult, to avoid conflicts with Kotlin Result class * Add missing shelf folder in .gitignore * Fix removal of kotlin reflect * Fix app sample code * Add mavenLocal() to app sample repositories for internal development * Fix README.md implementation example * Fix maven publication and artifact generation * Use project from maven source instead of local project * Create task to generate all dokka documentation * Update travis config to reflect new maven publication * Prepare release v0.0.3 Co-authored-by: Anthony Roux <m.roux.a@gmail.com>
diff --git a/.gitignore b/.gitignore
@@ -44,6 +44,7 @@ captures/
 .idea/assetWizardSettings.xml
 .idea/dictionaries
 .idea/libraries
+.idea/shelf
 .idea/runConfigurations.xml
 # Android Studio 3 in .gitignore file.
 .idea/caches
diff --git a/.travis.yml b/.travis.yml
@@ -34,12 +34,13 @@ jobs:
   include:
     - stage: build
       script:
-        - ./gradlew amadeus-android:clean
-        - ./gradlew amadeus-android:publishToMavenLocal
+        - ./gradlew clean
+        - ./gradlew publishToMavenLocal
+        - ./gradlew dokka
 
 deploy:
   - provider: pages
-    local-dir: amadeus-android/build/dokka
+    local-dir: build/dokka
     github-token: $GITHUB_TOKEN
     skip-cleanup: true
     keep-history: true
diff --git a/README.md b/README.md
@@ -20,12 +20,12 @@ You can install the SDK via Maven or Gradle.
 <dependency>
   <groupId>com.amadeus</groupId>
   <artifactId>amadeus-android</artifactId>
-  <version>0.0.2</version>
+  <version>0.0.3</version>
 </dependency>
 ```
 #### Gradle
 ```kotlin
-implementation "com.amadeus:amadeus-android:0.0.2"
+implementation 'com.amadeus:amadeus-android:0.0.3'
 ```
 
 ## Getting Started
diff --git a/air/build.gradle b/air/build.gradle
@@ -100,3 +100,5 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
+
+apply from: '../publish.gradle'
diff --git a/amadeus-android/build.gradle b/amadeus-android/build.gradle
@@ -78,12 +78,4 @@ dependencies {
     api "com.jakewharton.threetenabp:threetenabp:$threetenabp_version"
 }
 
-sourceSets {
-    main {
-        java {
-            srcDirs = ["src/main/java", "../air/src/main/java", "../base/src/main/java", "../hotel/src/main/java", "../trip/src/main/java"]
-        }
-    }
-}
-
-apply from: 'publish.gradle'
+apply from: '../publish.gradle'
diff --git a/amadeus-android/src/test/java/com/amadeus/android/service/AmadeusTest.kt b/amadeus-android/src/test/java/com/amadeus/android/service/AmadeusTest.kt
@@ -2,7 +2,7 @@ package com.amadeus.android.service
 
 import com.amadeus.android.Amadeus
 import com.amadeus.android.BuildConfig
-import com.amadeus.android.base.Result
+import com.amadeus.android.base.ApiResult
 import com.amadeus.android.base.succeeded
 import com.amadeus.android.domain.air.models.Location
 import kotlinx.coroutines.runBlocking
@@ -176,7 +176,7 @@ class AmadeusTest {
             view = "FULL_ALL_IMAGES"
         )
         when (offers) {
-            is Result.Success -> {
+            is ApiResult.Success -> {
                 assert(
                     amadeus.shopping.hotelOffer(offers.data.offers?.get(0)?.id ?: "").get()?.succeeded ?: false
                 )
diff --git a/app/build.gradle b/app/build.gradle
@@ -52,7 +52,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation project(path: ':amadeus-android')
+    implementation 'com.amadeus:amadeus-android:0.0.3'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.activity:activity-ktx:1.1.0'
diff --git a/app/src/main/java/com/amadeus/android/example/MainActivity.kt b/app/src/main/java/com/amadeus/android/example/MainActivity.kt
@@ -1,15 +1,13 @@
 package com.amadeus.android.example
 
 import android.os.Bundle
-import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import com.amadeus.android.example.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityMainBinding
-    private val viewModel: MainViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/com/amadeus/android/example/SampleApplication.kt b/app/src/main/java/com/amadeus/android/example/SampleApplication.kt
@@ -2,15 +2,14 @@ package com.amadeus.android.example
 
 import android.app.Application
 import com.amadeus.android.Amadeus
-import com.amadeus.android.BuildConfig
 
 class SampleApplication: Application() {
 
     override fun onCreate() {
         super.onCreate()
         amadeus = Amadeus.Builder(this)
-            .setClientId(BuildConfig.AMADEUS_CLIENT_ID)
-            .setClientSecret(BuildConfig.AMADEUS_CLIENT_SECRET)
+            .setClientId(getString(R.string.amadeus_client_id))
+            .setClientSecret(getString(R.string.amadeus_client_id))
             .setCustomAppIdAndVersion("com.amadeus.android.demo", "1.0.0")
             .setLogLevel(Amadeus.Builder.LogLevel.BODY)
             .setHostName(Amadeus.Builder.Hosts.TEST)
diff --git a/app/src/main/java/com/amadeus/android/example/fragments/search/HotelsOffersViewModel.kt b/app/src/main/java/com/amadeus/android/example/fragments/search/HotelsOffersViewModel.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.amadeus.android.base.Result
+import com.amadeus.android.base.ApiResult
 import com.amadeus.android.base.succeeded
 import com.amadeus.android.domain.hotel.models.HotelOffers
 import com.amadeus.android.example.SampleApplication
@@ -36,15 +36,15 @@ class HotelsOffersViewModel : ViewModel() {
                 checkInDate = checkInDate,
                 checkOutDate = checkOutDate
             )) {
-                is Result.Success -> {
+                is ApiResult.Success -> {
                     if (result.succeeded) {
                         _hotelOffers.value = result.data
                     } else {
                         //call return without data
                         error.value = "No result for your research"
                     }
                 }
-                is Result.Error -> error.value = "Error when retrieving data."
+                is ApiResult.Error -> error.value = "Error when retrieving data."
             }
             _loading.value = false
         }
diff --git a/base/build.gradle b/base/build.gradle
@@ -35,3 +35,5 @@ dependencies {
 
     implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
 }
+
+apply from: '../publish.gradle'
diff --git a/base/src/main/java/com/amadeus/android/base/ApiResult.kt b/base/src/main/java/com/amadeus/android/base/ApiResult.kt
@@ -1,20 +1,20 @@
 package com.amadeus.android.base
 
-import com.amadeus.android.base.Result.Success
+import com.amadeus.android.base.ApiResult.Success
 import com.squareup.moshi.JsonClass
 
 /**
  * A generic class that holds a value with its loading status.
  * @param <T>
  */
-sealed class Result<out T> {
+sealed class ApiResult<out T> {
 
     @JsonClass(generateAdapter = true)
     data class Success<out T> internal constructor(
         internal val meta: Meta?,
         val data: T,
         val dictionaries: Map<String, Any>?
-    ) : Result<T>() {
+    ) : ApiResult<T>() {
 
         @JsonClass(generateAdapter = true)
         data class Meta(val count: Int?, val links: Map<String, String>?)
@@ -23,7 +23,7 @@ sealed class Result<out T> {
     @JsonClass(generateAdapter = true)
     data class Error internal constructor(
         val errors: List<Issue> = ArrayList()
-    ) : Result<Nothing>() {
+    ) : ApiResult<Nothing>() {
 
         @JsonClass(generateAdapter = true)
         data class Issue internal constructor(
@@ -44,7 +44,7 @@ sealed class Result<out T> {
 }
 
 /**
- * `true` if [Result] is of type [Success] & holds non-null [Success.data].
+ * `true` if [ApiResult] is of type [Success] & holds non-null [Success.data].
  */
-val Result<*>.succeeded
+val ApiResult<*>.succeeded
     get() = this is Success && data != null
diff --git a/base/src/main/java/com/amadeus/android/base/BaseApi.kt b/base/src/main/java/com/amadeus/android/base/BaseApi.kt
@@ -1,6 +1,6 @@
 package com.amadeus.android.base
 
-import com.amadeus.android.base.Result.Success
+import com.amadeus.android.base.ApiResult.Success
 import com.squareup.moshi.Moshi
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
@@ -15,17 +15,17 @@ open class BaseApi(
     open val moshi = Moshi.Builder().build()
 
     /**
-     * Wrap a suspending API [call] in try/catch. In case an exception is thrown, a [Result.Error] is
+     * Wrap a suspending API [call] in try/catch. In case an exception is thrown, a [ApiResult.Error] is
      * created based.
      */
     @Suppress("BlockingMethodInNonBlockingContext")
-    suspend fun <T : Any> safeApiCall(call: suspend () -> ApiResponse<T>): Result<T>? {
+    suspend fun <T : Any> safeApiCall(call: suspend () -> ApiResponse<T>): ApiResult<T>? {
         return withContext(dispatcher) {
             val response = call()
             if (response.isSuccessful && response.body() != null) {
                 response.body()
             } else {
-                moshi.adapter(Result.Error::class.java)
+                moshi.adapter(ApiResult.Error::class.java)
                     .fromJson(response.errorBody()?.string() ?: "")
             }
         }
diff --git a/build.gradle b/build.gradle
@@ -48,9 +48,18 @@ allprojects {
         google()
         jcenter()
         mavenCentral()
+        mavenLocal()
     }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+apply plugin: 'org.jetbrains.dokka'
+
+dokka {
+    outputFormat = 'javadoc'
+    outputDirectory = 'build/dokka'
+    subProjects = ['base', 'air', 'hotel', 'trip', 'amadeus-android']
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # publication properties
 
-VERSION=0.0.2
+VERSION=0.0.3
 GROUP=com.amadeus
 
 POM_SCM_URL=git@github.com:amadeus4dev/amadeus-android.git
diff --git a/hotel/build.gradle b/hotel/build.gradle
@@ -70,3 +70,5 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
+
+apply from: '../publish.gradle'
diff --git a/hotel/src/main/java/com/amadeus/android/domain/hotel/tools/GeneratedCodeConverters.kt b/hotel/src/main/java/com/amadeus/android/domain/hotel/tools/GeneratedCodeConverters.kt
@@ -1,15 +1,13 @@
 package com.amadeus.android.domain.hotel.tools
 
 import com.squareup.moshi.Moshi
-import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import retrofit2.Converter
 import retrofit2.converter.moshi.MoshiConverterFactory
 
 
 object GeneratedCodeConverters {
     private val moshi = Moshi.Builder()
         .add(XNullableAdapterFactory())
-        .add(KotlinJsonAdapterFactory())
         .add(TypesAdapterFactory())
         .build()
 
diff --git a/publish.gradle b/publish.gradle
@@ -2,14 +2,13 @@ apply plugin: 'maven-publish'
 apply plugin: 'com.jfrog.bintray'
 
 task sourcesJar(type: Jar) {
-    from sourceSets.main.java.srcDirs
+    from android.sourceSets.main.java.srcDirs
     archiveClassifier = 'sources'
 }
 
 task dokkaJavadoc(type: dokka.getClass()) {
     outputFormat = 'javadoc'
     outputDirectory = "$buildDir/dokka"
-    subProjects = [":air", ":base", ":hotel", ":trip"]
 }
 
 task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
@@ -62,7 +61,7 @@ project.afterEvaluate {
                 }
 
                 groupId GROUP
-                artifactId POM_ARTIFACT_ID
+                artifactId project.name
                 version VERSION
 
                 pom.withXml {
@@ -71,21 +70,6 @@ project.afterEvaluate {
                     root.appendNode('name', POM_NAME)
                     root.appendNode('url', POM_URL)
                     root.children().last() + pomConfig
-
-                    def dependenciesNode = asNode().getAt('dependencies')[0] ?: asNode().appendNode('dependencies')
-
-                    // Iterate over the implementation dependencies (we don't want the test ones), adding a <dependency> node for each
-                    configurations.implementation.allDependencies.each {
-                        // Ensure dependencies such as fileTree are not included.
-                        if (!(it.name in ['unspecified', 'air', 'base', 'hotel', 'trip'])) {
-                            println("Updating Dependencies")
-                            def dependencyNode = dependenciesNode.appendNode('dependency')
-                            dependencyNode.appendNode('groupId', it.group)
-                            dependencyNode.appendNode('artifactId', it.name)
-                            dependencyNode.appendNode('version', it.version)
-                            println("Updated $it")
-                        }
-                    }
                 }
             }
         }
diff --git a/trip/build.gradle b/trip/build.gradle
@@ -80,3 +80,5 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
+
+apply from: '../publish.gradle'
diff --git a/trip/src/main/java/com/amadeus/android/domain/trip/tools/GeneratedCodeConverters.kt b/trip/src/main/java/com/amadeus/android/domain/trip/tools/GeneratedCodeConverters.kt
@@ -1,14 +1,12 @@
 package com.amadeus.android.domain.trip.tools
 
 import com.squareup.moshi.Moshi
-import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import retrofit2.Converter
 import retrofit2.converter.moshi.MoshiConverterFactory
 
 object GeneratedCodeConverters {
     private val moshi = Moshi.Builder()
         .add(XNullableAdapterFactory())
-        .add(KotlinJsonAdapterFactory())
         .add(TypesAdapterFactory())
         .build()
 

Original file line number	Diff line number	Diff line change
`@@ -100,3 +100,5 @@ dependencies {`
`100`	`100`	`androidTestImplementation 'androidx.test.ext:junit:1.1.1'`
`101`	`101`	`androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'`
`102`	`102`	`}`
	`103`	`+`
	`104`	`+apply from: '../publish.gradle'`