Skip to content

Commit

Permalink
Rename catalog to catalogue
Browse files Browse the repository at this point in the history
This is so we follow the decided naming

# Conflicts:
#	catalog/src/main/kotlin/com/tidal/sdk/catalog/Catalog.kt
#	catalogue/.openapi-generator-ignore
#	catalogue/.openapi-generator/FILES
#	catalogue/.openapi-generator/VERSION
#	catalogue/docs/AlbumAttributes.md
#	catalogue/docs/AlbumDataDocument.md
#	catalogue/docs/AlbumJSONAPI.md
#	catalogue/docs/AlbumJSONAPIApi.md
#	catalogue/docs/AlbumRelationship.md
#	catalogue/docs/AlbumRelationshipResource.md
#	catalogue/docs/AlbumRelationshipsDocument.md
#	catalogue/docs/AlbumResource.md
#	catalogue/docs/AlbumsDataDocument.md
#	catalogue/docs/ArtistAttributes.md
#	catalogue/docs/ArtistDataDocument.md
#	catalogue/docs/ArtistJSONAPI.md
#	catalogue/docs/ArtistJSONAPIApi.md
#	catalogue/docs/ArtistRelationship.md
#	catalogue/docs/ArtistRelationshipResource.md
#	catalogue/docs/ArtistRelationshipsDocument.md
#	catalogue/docs/ArtistResource.md
#	catalogue/docs/ArtistsDataDocument.md
#	catalogue/docs/AvailableAlbumRelationships.md
#	catalogue/docs/AvailableAlbumRelationshipsItems.md
#	catalogue/docs/AvailableAlbumRelationshipsItemsDataInner.md
#	catalogue/docs/AvailableAlbumRelationshipsItemsDataInnerMeta.md
#	catalogue/docs/AvailableArtistRelationships.md
#	catalogue/docs/AvailableTrackRelationships.md
#	catalogue/docs/AvailableVideoRelationships.md
#	catalogue/docs/ErrorDocument.md
#	catalogue/docs/ErrorObject.md
#	catalogue/docs/ErrorObjectSource.md
#	catalogue/docs/ExternalLink.md
#	catalogue/docs/ExternalLinkMeta.md
#	catalogue/docs/ImageLink.md
#	catalogue/docs/ImageLinkMeta.md
#	catalogue/docs/Links.md
#	catalogue/docs/ProviderAttributes.md
#	catalogue/docs/ProviderDataDocument.md
#	catalogue/docs/ProviderJSONAPI.md
#	catalogue/docs/ProviderJSONAPIApi.md
#	catalogue/docs/ProviderRelationshipResource.md
#	catalogue/docs/ProviderResource.md
#	catalogue/docs/ProvidersDataDocument.md
#	catalogue/docs/Relationship.md
#	catalogue/docs/ResourceIdentifier.md
#	catalogue/docs/ResourceRelationship.md
#	catalogue/docs/TrackAttributes.md
#	catalogue/docs/TrackDataDocument.md
#	catalogue/docs/TrackJSONAPI.md
#	catalogue/docs/TrackJSONAPIApi.md
#	catalogue/docs/TrackRelationship.md
#	catalogue/docs/TrackRelationshipResource.md
#	catalogue/docs/TrackRelationshipsDocument.md
#	catalogue/docs/TrackResource.md
#	catalogue/docs/TracksDataDocument.md
#	catalogue/docs/VideoAttributes.md
#	catalogue/docs/VideoDataDocument.md
#	catalogue/docs/VideoJSONAPI.md
#	catalogue/docs/VideoJSONAPIApi.md
#	catalogue/docs/VideoLink.md
#	catalogue/docs/VideoLinkMeta.md
#	catalogue/docs/VideoRelationship.md
#	catalogue/docs/VideoRelationshipResource.md
#	catalogue/docs/VideoRelationshipsDocument.md
#	catalogue/docs/VideoResource.md
#	catalogue/docs/VideosDataDocument.md
#	catalogue/gradle/wrapper/gradle-wrapper.jar
#	catalogue/gradle/wrapper/gradle-wrapper.properties
#	catalogue/gradlew
#	catalogue/gradlew.bat
#	catalogue/openapi.json
#	catalogue/proguard-rules.pro
#	catalogue/settings.gradle
  • Loading branch information
michpohl committed Jun 26, 2024
1 parent b8fa0fd commit 273c361
Show file tree
Hide file tree
Showing 34 changed files with 28 additions and 29 deletions.
19 changes: 0 additions & 19 deletions catalog/src/main/kotlin/com/tidal/sdk/catalog/Catalog.kt

This file was deleted.

File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ plugins {
}

android {
namespace = "com.tidal.sdk.catalog.demo"
namespace = "com.tidal.sdk.catalogue.demo"

defaultConfig {
applicationId = "com.tidal.sdk.catalog.demo"
applicationId = "com.tidal.sdk.catalogue.demo"
versionCode = 1
versionName = "0.1.0"
}
Expand All @@ -27,7 +27,7 @@ android {
}

dependencies {
implementation(project(":catalog"))
implementation(project(":catalogue"))

implementation(libs.bundles.compose)
implementation(libs.androidx.core.ktx)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import androidx.compose.material.Surface
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import com.tidal.sdk.catalog.Catalog
import com.tidal.sdk.catalogue.Catalogue

class MainActivity : ComponentActivity() {

Expand All @@ -22,7 +22,7 @@ class MainActivity : ComponentActivity() {
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colors.background,
) {
Greeting(Catalog().helloCatalog())
Greeting(Catalogue().helloCatalogue())
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion catalog/build.gradle.kts → catalogue/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

android {
namespace = "com.tidal.sdk.catalog"
namespace = "com.tidal.sdk.catalogue"
}

dependencies {
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tidal.catalog
package com.tidal.catalogue

import androidx.test.platform.app.InstrumentationRegistry
import org.junit.Assert.assertEquals
Expand Down
File renamed without changes.
18 changes: 18 additions & 0 deletions catalogue/src/main/kotlin/com/tidal/sdk/catalogue/Catalogue.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.tidal.sdk.catalogue

/**
* Demo documentation block for [Catalogue]
* @param optInt The constructor [Catalogue] takes an optional [Int]
* just to tell you about in this comment.
* As this is used directly by the demo application, which is using
* Jetpack Compose, this is a data class,which makes it easily comparable
* and helps prevent unnecessary recomposition
*/
data class Catalogue(private val optInt: Int = 5) {
/**
* This function returns the string "Catalogue! The string is: [optInt]"
*/
fun helloCatalogue(): String {
return "Catalogue! The int is: $optInt"
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tidal.catalog
package com.tidal.catalogue

import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serializa
kotlinx-serialization-retrofit-converter = { module = "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter", version = "1.0.0" }

# SDK
tidal-sdk-catalog = { module = "com.tidal.sdk:catalog", version = "0.1.0" }
tidal-sdk-catalogue = { module = "com.tidal.sdk:catalogue", version = "0.1.0" }
tidal-sdk-common = { module = "com.tidal.sdk:common", version = "0.2.5" }
tidal-sdk-auth = { module = "com.tidal.sdk:auth", version = "0.9.1" }
tidal-sdk-eventproducer = { module = "com.tidal.sdk:eventproducer", version = "0.3.1" }
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ listOf(
includeFromDefaultHierarchy("auth")
includeFromDefaultHierarchy("common")
includeFromDefaultHierarchy("eventproducer")
includeFromDefaultHierarchy("catalog")
includeFromDefaultHierarchy("catalogue")

0 comments on commit 273c361

Please sign in to comment.