Skip to content

Commit b3d6bef

Browse files
t-jimbot-jimbo
authored
Merge pull request #13 from plaidev/refactor/align-package-with-artifact-id
Align package namespace with artifact ID
2 parents 5a46c00 + 68816d8 commit b3d6bef

57 files changed

Lines changed: 290 additions & 290 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.idea/.name‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/kotlin/io/nubrick/example/MainActivity.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import androidx.compose.ui.Modifier
1616
import androidx.compose.ui.tooling.preview.Preview
1717
import androidx.compose.ui.unit.dp
1818
import io.nubrick.example.ui.theme.NubrickAndroidTheme
19-
import io.nubrick.sdk.Config
20-
import io.nubrick.sdk.Nubrick
21-
import io.nubrick.sdk.NubrickClient
22-
import io.nubrick.sdk.NubrickProvider
19+
import io.nubrick.nubrick.Config
20+
import io.nubrick.nubrick.Nubrick
21+
import io.nubrick.nubrick.NubrickClient
22+
import io.nubrick.nubrick.NubrickProvider
2323

2424
class MainActivity : ComponentActivity() {
2525
private lateinit var nubrick: NubrickClient

‎e2e/src/main/kotlin/io/nubrick/e2e/MainActivity.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ import androidx.compose.ui.Alignment
1515
import androidx.compose.ui.Modifier
1616
import androidx.compose.ui.unit.dp
1717
import io.nubrick.e2e.ui.theme.NubrickAndroidTheme
18-
import io.nubrick.sdk.Config
19-
import io.nubrick.sdk.Nubrick
20-
import io.nubrick.sdk.NubrickClient
21-
import io.nubrick.sdk.NubrickProvider
22-
import io.nubrick.sdk.component.EmbeddingLoadingState
23-
import io.nubrick.sdk.remoteconfig.RemoteConfigLoadingState
18+
import io.nubrick.nubrick.Config
19+
import io.nubrick.nubrick.Nubrick
20+
import io.nubrick.nubrick.NubrickClient
21+
import io.nubrick.nubrick.NubrickProvider
22+
import io.nubrick.nubrick.component.EmbeddingLoadingState
23+
import io.nubrick.nubrick.remoteconfig.RemoteConfigLoadingState
2424

2525
class MainActivity : ComponentActivity() {
2626
private lateinit var nubrick: NubrickClient

‎nubrick/build.gradle.kts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ plugins {
88
}
99

1010
group = "io.nubrick"
11-
version = "0.7.1"
11+
version = "0.8.0"
1212

1313
android {
14-
namespace = "io.nubrick.sdk"
14+
namespace = "io.nubrick.nubrick"
1515
compileSdk = 36
1616

1717
defaultConfig {
@@ -81,16 +81,16 @@ tasks.register<Jar>("javadocEmptyJar") {
8181
}
8282
tasks.register<Zip>("makeArchive") {
8383
dependsOn("publishMavenPublicationToMavenRepository")
84-
from(layout.buildDirectory.dir("repos/io/nubrick/sdk/$version"))
85-
into("io/nubrick/sdk/$version")
84+
from(layout.buildDirectory.dir("repos/io/nubrick/nubrick/$version"))
85+
into("io/nubrick/nubrick/$version")
8686
}
8787

8888
afterEvaluate {
8989
publishing {
9090
publications {
9191
register<MavenPublication>("maven") {
9292
groupId = project.group as String
93-
artifactId = "sdk"
93+
artifactId = "nubrick"
9494
version = project.version as String
9595
from(components["release"])
9696
artifact(tasks["javadocEmptyJar"])

nubrick/src/androidTest/kotlin/io/nubrick/sdk/ExampleInstrumentedTest.kt renamed to nubrick/src/androidTest/kotlin/io/nubrick/nubrick/ExampleInstrumentedTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.nubrick.sdk
1+
package io.nubrick.nubrick
22

33
import androidx.test.platform.app.InstrumentationRegistry
44
import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
1919
fun useAppContext() {
2020
// Context of the app under test.
2121
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
22-
assertEquals("io.nubrick.sdk.test", appContext.packageName)
22+
assertEquals("io.nubrick.nubrick.test", appContext.packageName)
2323
}
2424
}

nubrick/src/androidTest/kotlin/io/nubrick/sdk/data/database/database.kt renamed to nubrick/src/androidTest/kotlin/io/nubrick/nubrick/data/database/database.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.nubrick.sdk.data.database
1+
package io.nubrick.nubrick.data.database
22

33
import org.junit.Assert
44
import org.junit.Test

nubrick/src/androidTest/kotlin/io/nubrick/sdk/data/user/user.kt renamed to nubrick/src/androidTest/kotlin/io/nubrick/nubrick/data/user/user.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package io.nubrick.sdk.data.user
1+
package io.nubrick.nubrick.data.user
22

33

44
import android.os.Build
55
import androidx.test.ext.junit.runners.AndroidJUnit4
66
import androidx.test.platform.app.InstrumentationRegistry
7-
import io.nubrick.sdk.VERSION
8-
import io.nubrick.sdk.schema.BuiltinUserProperty
7+
import io.nubrick.nubrick.VERSION
8+
import io.nubrick.nubrick.schema.BuiltinUserProperty
99
import org.junit.Assert
1010
import org.junit.Test
1111
import org.junit.runner.RunWith

nubrick/src/main/kotlin/io/nubrick/sdk/component/bridge/uiblock_event_bridge_view_model.kt renamed to nubrick/src/main/kotlin/io/nubrick/nubrick/component/bridge/uiblock_event_bridge_view_model.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package io.nubrick.sdk.component.bridge
1+
package io.nubrick.nubrick.component.bridge
22

33
import androidx.compose.runtime.Composable
44
import androidx.compose.runtime.LaunchedEffect
55
import androidx.lifecycle.ViewModel
6-
import io.nubrick.sdk.component.provider.container.ContainerContext
7-
import io.nubrick.sdk.component.provider.data.DataContext
8-
import io.nubrick.sdk.component.provider.event.LocalEventListener
9-
import io.nubrick.sdk.schema.UIBlockEventDispatcher
6+
import io.nubrick.nubrick.component.provider.container.ContainerContext
7+
import io.nubrick.nubrick.component.provider.data.DataContext
8+
import io.nubrick.nubrick.component.provider.event.LocalEventListener
9+
import io.nubrick.nubrick.schema.UIBlockEventDispatcher
1010
import kotlinx.coroutines.DelicateCoroutinesApi
1111
import kotlinx.coroutines.Dispatchers
1212
import kotlinx.coroutines.GlobalScope

nubrick/src/main/kotlin/io/nubrick/sdk/component/embedding.kt renamed to nubrick/src/main/kotlin/io/nubrick/nubrick/component/embedding.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.nubrick.sdk.component
1+
package io.nubrick.nubrick.component
22

33
import androidx.compose.animation.AnimatedContent
44
import androidx.compose.animation.fadeIn
@@ -16,10 +16,10 @@ import androidx.compose.runtime.remember
1616
import androidx.compose.runtime.setValue
1717
import androidx.compose.ui.Alignment
1818
import androidx.compose.ui.Modifier
19-
import io.nubrick.sdk.Event
20-
import io.nubrick.sdk.data.Container
21-
import io.nubrick.sdk.data.NotFoundException
22-
import io.nubrick.sdk.schema.UIBlock
19+
import io.nubrick.nubrick.Event
20+
import io.nubrick.nubrick.data.Container
21+
import io.nubrick.nubrick.data.NotFoundException
22+
import io.nubrick.nubrick.schema.UIBlock
2323

2424
sealed class EmbeddingLoadingState {
2525
class Loading(): EmbeddingLoadingState()

nubrick/src/main/kotlin/io/nubrick/sdk/component/modal.kt renamed to nubrick/src/main/kotlin/io/nubrick/nubrick/component/modal.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package io.nubrick.sdk.component
1+
package io.nubrick.nubrick.component
22

33
import androidx.compose.material3.ExperimentalMaterial3Api
44
import androidx.compose.material3.SheetState
55
import androidx.compose.material3.SheetValue
66
import androidx.compose.runtime.getValue
77
import androidx.compose.runtime.mutableStateOf
88
import androidx.compose.runtime.setValue
9-
import io.nubrick.sdk.component.provider.pageblock.PageBlockData
10-
import io.nubrick.sdk.schema.ModalPresentationStyle
11-
import io.nubrick.sdk.schema.ModalScreenSize
12-
import io.nubrick.sdk.schema.UIBlockEventDispatcher
9+
import io.nubrick.nubrick.component.provider.pageblock.PageBlockData
10+
import io.nubrick.nubrick.schema.ModalPresentationStyle
11+
import io.nubrick.nubrick.schema.ModalScreenSize
12+
import io.nubrick.nubrick.schema.UIBlockEventDispatcher
1313
import kotlinx.coroutines.CoroutineScope
1414
import kotlinx.coroutines.launch
1515
import kotlinx.serialization.json.JsonElement

0 commit comments

Comments
 (0)