Skip to content

Commit 1d587f3

Browse files
fix: viewname and compose compiler plugin (#66)
1 parent 34b233b commit 1d587f3

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

build.gradle

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@ buildscript {
1212
dependencies {
1313
classpath 'com.android.tools.build:gradle:7.4.1'
1414
classpath 'com.mparticle:android-kit-plugin:' + project.version
15-
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0'
15+
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0'
1616
}
1717
}
1818

1919
plugins {
2020
id "org.sonarqube" version "3.5.0.2730"
2121
id "org.jlleitschuh.gradle.ktlint" version "11.2.0"
22-
id "org.jetbrains.kotlin.plugin.compose" version "2.0.0"
2322
}
2423

2524
sonarqube {
@@ -35,6 +34,7 @@ apply plugin: "kotlin-android"
3534
apply plugin: 'com.mparticle.kit'
3635

3736
android {
37+
namespace 'com.mparticle.kits.rokt'
3838
defaultConfig {
3939
minSdkVersion 21
4040
consumerProguardFiles 'consumer-proguard.pro'
@@ -52,6 +52,9 @@ android {
5252
buildFeatures {
5353
compose true
5454
}
55+
composeOptions {
56+
kotlinCompilerExtensionVersion = "1.5.0"
57+
}
5558
}
5659

5760
repositories {
@@ -60,18 +63,20 @@ repositories {
6063
}
6164

6265
dependencies {
66+
def composeBom = platform('androidx.compose:compose-bom:2023.10.01')
67+
implementation composeBom
6368
implementation 'androidx.annotation:annotation:1.5.0'
6469
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
65-
implementation 'androidx.compose.runtime:runtime-android:1.8.3'
70+
implementation 'androidx.compose.runtime:runtime'
6671
api 'com.rokt:roktsdk:4.11.0'
6772

6873
testImplementation files('libs/java-json.jar')
6974
testImplementation 'com.squareup.assertj:assertj-android:1.2.0'
7075
testImplementation ("io.mockk:mockk:1.13.4")
7176
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
72-
compileOnly 'androidx.compose.ui:ui:1.0.0'
73-
compileOnly 'androidx.compose.material:material:1.0.0'
74-
compileOnly 'androidx.compose.ui:ui-tooling:1.0.0'
77+
compileOnly 'androidx.compose.ui:ui'
78+
compileOnly 'androidx.compose.material:material'
79+
compileOnly 'androidx.compose.ui:ui-tooling'
7580
}
7681

7782
ktlint {

src/main/kotlin/com/mparticle/kits/RoktLayout.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import com.rokt.roktsdk.Rokt
1212
@Suppress("FunctionName")
1313
fun RoktLayout(
1414
sdkTriggered: Boolean,
15-
viewName: String,
15+
identifier: String,
1616
attributes: Map<String, String>,
1717
location: String,
1818
modifier: Modifier = Modifier,
@@ -30,7 +30,7 @@ fun RoktLayout(
3030

3131
resultMapState.value?.let { resultMap ->
3232
com.rokt.roktsdk.RoktLayout(
33-
sdkTriggered, viewName, modifier, resultMap.attributes, location,
33+
sdkTriggered, identifier, modifier, resultMap.attributes, location,
3434
onLoad = { resultMap.callback.onLoad() },
3535
onShouldShowLoadingIndicator = { resultMap.callback.onShouldShowLoadingIndicator() },
3636
onShouldHideLoadingIndicator = { resultMap.callback.onShouldHideLoadingIndicator() },

0 commit comments

Comments
 (0)