From c568817510b301110c301d658bcc5f3bcb09d5ae Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Thu, 23 May 2024 22:26:55 +0300 Subject: [PATCH 01/20] feat: creates buildSrc module --- buildSrc/build.gradle.kts | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 buildSrc/build.gradle.kts diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 00000000..18326b84 --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + `kotlin-dsl` + id("java-library") +} +repositories { + gradlePluginPortal() +} From c7361f2b8ed141ba1fe94269e5c7e90ba8d97b1e Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Thu, 23 May 2024 22:27:15 +0300 Subject: [PATCH 02/20] feat: creates RudderstackBuildConfig with default values --- .../src/main/kotlin/RudderstackBuildConfig.kt | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 buildSrc/src/main/kotlin/RudderstackBuildConfig.kt diff --git a/buildSrc/src/main/kotlin/RudderstackBuildConfig.kt b/buildSrc/src/main/kotlin/RudderstackBuildConfig.kt new file mode 100644 index 00000000..9c206a75 --- /dev/null +++ b/buildSrc/src/main/kotlin/RudderstackBuildConfig.kt @@ -0,0 +1,28 @@ +import org.gradle.api.JavaVersion + +object RudderstackBuildConfig { + + object Build { + val JAVA_VERSION = JavaVersion.VERSION_17 + val JVM_TARGET = "17" + } + + object Android { + val COMPILE_SDK = 34 + val MIN_SDK = 19 + val TARGET_SDK = COMPILE_SDK + } + + object Version { + val VERSION_NAME = "\"2.0\"" + } + + object Kotlin { + val COMPILER_EXTENSION_VERSION = "1.4.8" + } + + object ReleaseInfo { + val VERSION_NAME = "" + val GROUP_NAME = "" + } +} From 3d49a818f7391dfb9ebe99401254ec844ce1f1bd Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Thu, 23 May 2024 22:27:27 +0300 Subject: [PATCH 03/20] feat: creates libs.versions.toml file --- gradle/libs.versions.toml | 58 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 gradle/libs.versions.toml diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..348acd13 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,58 @@ +[versions] +android-core-ktx = "1.10.1" +gradle = "8.2.2" +kotlin = "1.8.22" +mockk = "1.13.3" +work = "2.9.0" +gson = "2.8.8" +jackson-core = "2.13.3" +jackson-module = "2.13.3" +moshi = "1.13.0" +mockito-kotlin = "4.0.0" +mockito = "4.0.0" +android-x-test = "1.4.0" +android-x-testrules = "1.4.0" +android-x-test-ext-junitktx = "1.1.3" +android-x-testrunner = "1.4.0" +android-x-annotation = "1.6.0" +android-x-test-espresso = "3.5.1" +hamcrest = "2.2" +awaitility = "4.1.0" +robolectric = "4.12.1" +junit = "4.+" +json-assert = "1.5.0" +gradle-nexus-publish = "1.3.0" + +[libraries] +android-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "android-core-ktx" } +gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" } +kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } +mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" } +mockk-agent = { group = "io.mockk", name = "mockk-agent-jvm", version.ref = "mockk" } +work = { group = "androidx.work", name = "work-runtime", version.ref = "work" } +work-multiprocess = { group = "androidx.work", name = "work-multiprocess", version.ref = "work" } +work-test = { group = "androidx.work", name = "work-testing", version.ref = "work" } +gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } +jackson-core = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson-core" } +jackson-module = { group = "com.fasterxml.jackson.module", name = "jackson-module-kotlin", version.ref = "jackson-module" } +moshi-kotlin = { group = "com.squareup.moshi", name = "moshi-kotlin", version.ref = "moshi" } +moshi-adapters = { group = "com.squareup.moshi", name = "moshi-adapters", version.ref = "moshi" } +moshi = { group = "com.squareup.moshi", name = "moshi", version.ref = "moshi" } +mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref = "mockito-kotlin" } +mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" } +android-x-test = { group = "androidx.test", name = "core", version.ref = "android-x-test" } +android-x-testrules = { group = "androidx.test", name = "rules", version.ref = "android-x-testrules" } +android-x-test-ext-junitktx = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "android-x-test-ext-junitktx" } +android-x-test-espresso = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "android-x-test-espresso" } +android-x-annotation = { group = "androidx.annotation", name = "annotation", version.ref = "android-x-annotation" } +android-x-testrunner = { group = "androidx.test", name = "runner", version.ref = "android-x-testrunner" } +hamcrest = { group = "org.hamcrest", name = "hamcrest", version.ref = "hamcrest" } +awaitility = { group = "org.awaitility", name = "awaitility", version.ref = "awaitility" } +robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +json-assert = { group = "org.skyscreamer", name = "jsonassert", version.ref = "json-assert" } + +[plugins] +gradle-nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "gradle-nexus-publish" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } From 56101fbd126be7be4fa6e29e2b37a98218df2a25 Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Thu, 23 May 2024 22:29:06 +0300 Subject: [PATCH 04/20] feat: converts android module build.gradle file to kts --- android/build.gradle.kts | 89 +++++++++++++++++++ .../build.gradle.file | 56 ++++-------- 2 files changed, 104 insertions(+), 41 deletions(-) create mode 100644 android/build.gradle.kts rename android/build.gradle => repository/build.gradle.file (54%) diff --git a/android/build.gradle.kts b/android/build.gradle.kts new file mode 100644 index 00000000..cdb79256 --- /dev/null +++ b/android/build.gradle.kts @@ -0,0 +1,89 @@ +plugins { + id("com.android.library") + id("kotlin-android") +} + +android { + + namespace = "com.rudderstack.android" + + compileSdk = RudderstackBuildConfig.Android.COMPILE_SDK + + buildFeatures { + buildFeatures { + buildConfig = true + } + } + defaultConfig { + minSdk = RudderstackBuildConfig.Android.MIN_SDK + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + buildConfigField( + "String", + "LIBRARY_VERSION_NAME", + RudderstackBuildConfig.Version.VERSION_NAME + ) + } + + buildTypes { + named("release") { + isMinifyEnabled = false + setProguardFiles( + listOf( + getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" + ) + ) + } + } + compileOptions { + sourceCompatibility = RudderstackBuildConfig.Build.JAVA_VERSION + targetCompatibility = RudderstackBuildConfig.Build.JAVA_VERSION + } + kotlinOptions { + jvmTarget = RudderstackBuildConfig.Build.JVM_TARGET + javaParameters = true + } + testOptions { + unitTests { + this.isIncludeAndroidResources = true + } + } +} + +dependencies { + implementation(libs.android.core.ktx) + api(project(":core")) + api(project(":models")) + api(project(":repository")) + + compileOnly(project(":jacksonrudderadapter")) + compileOnly(project(":gsonrudderadapter")) + compileOnly(project(":moshirudderadapter")) + compileOnly(project(":rudderjsonadapter")) + compileOnly(libs.work) + compileOnly(libs.work.multiprocess) + + testImplementation(project(":jacksonrudderadapter")) + testImplementation(project(":gsonrudderadapter")) + testImplementation(project(":moshirudderadapter")) + testImplementation(project(":rudderjsonadapter")) + testImplementation(project(":libs:test-common")) + testImplementation(libs.android.x.test) + testImplementation(libs.android.x.testrules) + testImplementation(libs.android.x.test.ext.junitktx) + testImplementation(libs.awaitility) + testImplementation(libs.hamcrest) + testImplementation(libs.junit) + testImplementation(libs.mockito.core) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.mockk) + testImplementation(libs.mockk.agent) + testImplementation(libs.robolectric) + testImplementation(libs.work.test) + + androidTestImplementation(libs.android.x.test.ext.junitktx) +} + +apply(from = "${project.projectDir.parentFile}/gradle/artifacts-aar.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/mvn-publish.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/codecov.gradle") diff --git a/android/build.gradle b/repository/build.gradle.file similarity index 54% rename from android/build.gradle rename to repository/build.gradle.file index a9d1dc79..b4bb147f 100644 --- a/android/build.gradle +++ b/repository/build.gradle.file @@ -1,5 +1,5 @@ /* - * Creator: Debanjan Chatterjee on 28/10/21, 7:56 PM Last modified: 28/10/21, 7:56 PM + * Creator: Debanjan Chatterjee on 30/09/21, 11:41 PM Last modified: 30/09/21, 11:39 PM * Copyright: All rights reserved Ⓒ 2021 http://rudderstack.com * * Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -16,23 +16,18 @@ plugins { id 'com.android.library' id 'kotlin-android' } - apply from : "$projectDir/../dependencies.gradle" android { + namespace 'com.rudderstack.android.repository' compileSdk library.target_sdk - buildFeatures{ - buildConfig true - } + defaultConfig { minSdk library.min_sdk targetSdk library.target_sdk testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" - - //for code access - buildConfigField "String", "LIBRARY_VERSION_NAME", library.version_name } buildTypes { @@ -41,61 +36,40 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + kotlinOptions { + jvmTarget = '17' + } compileOptions { sourceCompatibility JavaVersion.VERSION_17 targetCompatibility JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = '17' + java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } testOptions { unitTests { includeAndroidResources = true } } - namespace 'com.rudderstack.android' } dependencies { - implementation deps.kotlinCore -// implementation 'androidx.appcompat:appcompat:1.3.1' -// implementation 'com.google.android.material:material:1.4.0' - //dependency on work manager - //core kotlin project - api project(path: projects.core) - api project(path: projects.models) - api project(path: projects.repository) - compileOnly project(path: projects.jackson_rudder_adapter) - compileOnly project(path: projects.gson_rudder_adapter) - compileOnly project(path: projects.moshi_rudder_adapter) - compileOnly project(path: projects.json_rudder_adapter) - - //work manager - //user needs to provide dependency, in case work manager is used - compileOnly deps.work - compileOnly deps.workMultiprocess + testImplementation deps.androidXTestExtJunitKtx + testImplementation deps.androidXTestRules - testImplementation project(path: projects.jackson_rudder_adapter) - testImplementation project(path: projects.gson_rudder_adapter) - testImplementation project(path: projects.moshi_rudder_adapter) - testImplementation project(path: projects.json_rudder_adapter) - testImplementation(project(path: projects.test_common)) - testImplementation deps.androidXTest + testImplementation deps.junit testImplementation deps.androidXTest testImplementation deps.hamcrest testImplementation deps.mockito - testImplementation deps.mockito_kotlin - testImplementation deps.mockk - testImplementation deps.mockk_agent_jvm testImplementation deps.awaitility testImplementation deps.robolectric - implementation deps.androidXTestExtJunitKtx - implementation deps.androidXTestRules - testImplementation deps.junit - testImplementation deps.workTest + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test:rules:1.5.0' androidTestImplementation deps.androidXTestExtJunitKtx + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' } apply from: rootProject.file('gradle/artifacts-aar.gradle') apply from: rootProject.file('gradle/mvn-publish.gradle') From 7a2a6d946a2453ea57e7a5066b45232a730943fd Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Thu, 23 May 2024 22:29:51 +0300 Subject: [PATCH 05/20] feat: converts core module build.gradle file to kts --- core/build.gradle.kts | 26 +++++++++++++++++++ .../build.gradle.file | 25 +++++------------- 2 files changed, 32 insertions(+), 19 deletions(-) create mode 100644 core/build.gradle.kts rename core/build.gradle => gsonrudderadapter/build.gradle.file (62%) diff --git a/core/build.gradle.kts b/core/build.gradle.kts new file mode 100644 index 00000000..f5d77026 --- /dev/null +++ b/core/build.gradle.kts @@ -0,0 +1,26 @@ +plugins { + id("java-library") + id("kotlin") +} + +dependencies { + api(project(":rudderjsonadapter")) + api(project(":models")) + api(project(":web")) + + testImplementation(libs.awaitility) + testImplementation(libs.junit) + testImplementation(libs.hamcrest) + testImplementation(libs.mockito.core) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.mockk) + + testImplementation(project(":moshirudderadapter")) + testImplementation(project(":libs:test-common")) + testImplementation(project(":gsonrudderadapter")) + testImplementation(project(":jacksonrudderadapter")) +} + +apply(from = "${project.projectDir.parentFile}/gradle/artifacts-jar.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/mvn-publish.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/codecov.gradle") diff --git a/core/build.gradle b/gsonrudderadapter/build.gradle.file similarity index 62% rename from core/build.gradle rename to gsonrudderadapter/build.gradle.file index 58ec8218..528c5677 100644 --- a/core/build.gradle +++ b/gsonrudderadapter/build.gradle.file @@ -1,5 +1,5 @@ /* - * Creator: Debanjan Chatterjee on 18/10/21, 12:09 PM Last modified: 18/10/21, 12:09 PM + * Creator: Debanjan Chatterjee on 30/09/21, 11:41 PM Last modified: 30/09/21, 11:39 PM * Copyright: All rights reserved Ⓒ 2021 http://rudderstack.com * * Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -16,7 +16,6 @@ plugins { id 'java-library' id 'kotlin' } - java { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 @@ -32,27 +31,15 @@ compileTestKotlin { apply from : "$projectDir/../dependencies.gradle" + + dependencies { -// api project(path: ':repository') - api project(path: ':rudderjsonadapter') - api project(path: ':models') - api project(path: ':web') + implementation(project(path: ":rudderjsonadapter")) + api deps.gson -// api(project(":web")) -// implementation(project(":rudderjsonadapter")) -// implementation(project(":repository")) - testImplementation 'junit:junit:4.+' testImplementation deps.hamcrest - testImplementation deps.mockito - testImplementation deps.mockito_kotlin - testImplementation deps.awaitility - testImplementation deps.mockk - - testImplementation(project(path: ':moshirudderadapter')) - testImplementation(project(path: projects.test_common)) - testImplementation(project(path: ':gsonrudderadapter')) - testImplementation(project(path: ':jacksonrudderadapter')) + testImplementation 'junit:junit:4.+' } apply from: "$projectDir/../gradle/artifacts-jar.gradle" apply from: "$projectDir/../gradle/mvn-publish.gradle" From 7b909ab15a915968f741fb89b6d01b222da216bc Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Thu, 23 May 2024 22:32:32 +0300 Subject: [PATCH 06/20] feat: converts gsonrudderadapter module build.gradle file to kts --- gsonrudderadapter/build.gradle.kts | 16 ++++++++++++++++ .../build.gradle.file | 0 .../build.gradle.file | 0 3 files changed, 16 insertions(+) create mode 100644 gsonrudderadapter/build.gradle.kts rename {gsonrudderadapter => jacksonrudderadapter}/build.gradle.file (100%) rename gsonrudderadapter/build.gradle => moshirudderadapter/build.gradle.file (100%) diff --git a/gsonrudderadapter/build.gradle.kts b/gsonrudderadapter/build.gradle.kts new file mode 100644 index 00000000..50f439a9 --- /dev/null +++ b/gsonrudderadapter/build.gradle.kts @@ -0,0 +1,16 @@ +plugins { + id("java-library") + id("kotlin") +} + +dependencies { + implementation(project(":rudderjsonadapter")) + api(libs.gson) + testImplementation(libs.junit) + testImplementation(libs.hamcrest) + +} + +apply(from = "${project.projectDir.parentFile}/gradle/artifacts-jar.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/mvn-publish.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/codecov.gradle") diff --git a/gsonrudderadapter/build.gradle.file b/jacksonrudderadapter/build.gradle.file similarity index 100% rename from gsonrudderadapter/build.gradle.file rename to jacksonrudderadapter/build.gradle.file diff --git a/gsonrudderadapter/build.gradle b/moshirudderadapter/build.gradle.file similarity index 100% rename from gsonrudderadapter/build.gradle rename to moshirudderadapter/build.gradle.file From 4141c9150af6b0765a08e5f870c079b1a5727f86 Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Thu, 23 May 2024 22:33:08 +0300 Subject: [PATCH 07/20] feat: converts jacksonrudderadapter module build.gradle file to kts --- jacksonrudderadapter/build.gradle.kts | 17 +++++++++++++ .../build.gradle.file | 7 ++---- .../build.gradle.file | 25 +++++++++++++------ 3 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 jacksonrudderadapter/build.gradle.kts rename jacksonrudderadapter/build.gradle => rudderjsonadapter/build.gradle.file (92%) rename {jacksonrudderadapter => web}/build.gradle.file (63%) diff --git a/jacksonrudderadapter/build.gradle.kts b/jacksonrudderadapter/build.gradle.kts new file mode 100644 index 00000000..9d891d9b --- /dev/null +++ b/jacksonrudderadapter/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + id("java-library") + id("kotlin") +} + +dependencies { + implementation(project(":rudderjsonadapter")) + api(libs.jackson.core) + api(libs.jackson.module) + testImplementation(libs.junit) + testImplementation(libs.hamcrest) + +} + +apply(from = "${project.projectDir.parentFile}/gradle/artifacts-jar.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/mvn-publish.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/codecov.gradle") diff --git a/jacksonrudderadapter/build.gradle b/rudderjsonadapter/build.gradle.file similarity index 92% rename from jacksonrudderadapter/build.gradle rename to rudderjsonadapter/build.gradle.file index c64dce09..02a22140 100644 --- a/jacksonrudderadapter/build.gradle +++ b/rudderjsonadapter/build.gradle.file @@ -32,14 +32,11 @@ compileTestKotlin { apply from : "$projectDir/../dependencies.gradle" -dependencies { - implementation(project(path: ":rudderjsonadapter")) - api deps.jackson - api deps.jacksonKotlin +dependencies { - testImplementation deps.hamcrest testImplementation 'junit:junit:4.+' + testImplementation deps.hamcrest } apply from: rootProject.file('gradle/artifacts-jar.gradle') apply from: rootProject.file('gradle/mvn-publish.gradle') diff --git a/jacksonrudderadapter/build.gradle.file b/web/build.gradle.file similarity index 63% rename from jacksonrudderadapter/build.gradle.file rename to web/build.gradle.file index 528c5677..96258e76 100644 --- a/jacksonrudderadapter/build.gradle.file +++ b/web/build.gradle.file @@ -16,6 +16,7 @@ plugins { id 'java-library' id 'kotlin' } + java { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 @@ -24,23 +25,31 @@ compileKotlin { kotlinOptions.jvmTarget = "17" kotlinOptions.javaParameters = true } + +apply from : "$projectDir/../dependencies.gradle" compileTestKotlin { kotlinOptions.jvmTarget = "17" kotlinOptions.javaParameters = true } -apply from : "$projectDir/../dependencies.gradle" - - dependencies { implementation(project(path: ":rudderjsonadapter")) - api deps.gson + //test + testImplementation 'junit:junit:4.13.2' + testImplementation(project(path: ':moshirudderadapter', configuration: 'default')) + testImplementation(project(path: ':gsonrudderadapter', configuration: 'default')) + testImplementation(project(path: ':jacksonrudderadapter', configuration: 'default')) + testImplementation deps.moshi.kotlin + testImplementation deps.moshi.core + testImplementation deps.gson + testImplementation deps.jackson testImplementation deps.hamcrest - testImplementation 'junit:junit:4.+' + testImplementation deps.mockito + testImplementation deps.awaitility } -apply from: "$projectDir/../gradle/artifacts-jar.gradle" -apply from: "$projectDir/../gradle/mvn-publish.gradle" -apply from: "$projectDir/../gradle/codecov.gradle" +apply from: rootProject.file('gradle/artifacts-jar.gradle') +apply from: rootProject.file('gradle/mvn-publish.gradle') +apply from: rootProject.file('gradle/codecov.gradle') From 480ad1eed0b855cca28470205b2e3fcf2d233ab9 Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Thu, 23 May 2024 22:33:47 +0300 Subject: [PATCH 08/20] feat: converts models module build.gradle file to kts --- models/build.gradle | 62 ----------------------------------------- models/build.gradle.kts | 31 +++++++++++++++++++++ 2 files changed, 31 insertions(+), 62 deletions(-) delete mode 100644 models/build.gradle create mode 100644 models/build.gradle.kts diff --git a/models/build.gradle b/models/build.gradle deleted file mode 100644 index b31e0b3c..00000000 --- a/models/build.gradle +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Creator: Debanjan Chatterjee on 30/09/21, 11:41 PM Last modified: 30/09/21, 11:39 PM - * Copyright: All rights reserved Ⓒ 2021 http://rudderstack.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -plugins { - id 'java-library' - id 'kotlin' -} -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 -} -compileKotlin { - kotlinOptions.jvmTarget = "17" - kotlinOptions.javaParameters = true -} -compileTestKotlin { - kotlinOptions.jvmTarget = "17" - kotlinOptions.javaParameters = true -} - -apply from : "$projectDir/../dependencies.gradle" - -dependencies { - - //json parsers as compileOnly just for annotations - compileOnly deps.gson - compileOnly deps.jackson - compileOnly deps.moshi.core - compileOnly deps.moshi.kotlin - compileOnly deps.moshi.adapter - - //test - testImplementation 'junit:junit:4.+' - - testImplementation deps.gson - testImplementation deps.jackson - testImplementation deps.moshi.core - testImplementation deps.moshi.kotlin - testImplementation deps.moshi.adapter - testImplementation deps.jsonAssert - - testImplementation(project(':moshirudderadapter')) - testImplementation(project(':gsonrudderadapter')) - testImplementation(project(':jacksonrudderadapter')) - testImplementation(project(":rudderjsonadapter")) - - testImplementation deps.hamcrest -} -apply from: rootProject.file('gradle/artifacts-jar.gradle') -apply from: rootProject.file('gradle/mvn-publish.gradle') -apply from: rootProject.file('gradle/codecov.gradle') diff --git a/models/build.gradle.kts b/models/build.gradle.kts new file mode 100644 index 00000000..4c979c3b --- /dev/null +++ b/models/build.gradle.kts @@ -0,0 +1,31 @@ +plugins { + id("java-library") + id("kotlin") +} + +dependencies { + compileOnly(libs.gson) + compileOnly(libs.jackson.core) + compileOnly(libs.jackson.module) + compileOnly(libs.moshi) + compileOnly(libs.moshi.kotlin) + compileOnly(libs.moshi.adapters) + + testImplementation(libs.hamcrest) + testImplementation(libs.junit) + testImplementation(libs.gson) + testImplementation(libs.jackson.core) + testImplementation(libs.moshi) + testImplementation(libs.moshi.kotlin) + testImplementation(libs.moshi.adapters) + testImplementation(libs.json.assert) + + testImplementation(project(":moshirudderadapter")) + testImplementation(project(":gsonrudderadapter")) + testImplementation(project(":jacksonrudderadapter")) + testImplementation(project(":rudderjsonadapter")) +} + +apply(from = "${project.projectDir.parentFile}/gradle/artifacts-jar.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/mvn-publish.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/codecov.gradle") From 2d3915bdc5231b7e2e2b556b67534a0037a16db2 Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Thu, 23 May 2024 22:34:16 +0300 Subject: [PATCH 09/20] feat: converts moshirudderadapter module build.gradle file to kts --- moshirudderadapter/build.gradle | 47 ---------------------------- moshirudderadapter/build.gradle.file | 46 --------------------------- moshirudderadapter/build.gradle.kts | 17 ++++++++++ 3 files changed, 17 insertions(+), 93 deletions(-) delete mode 100644 moshirudderadapter/build.gradle delete mode 100644 moshirudderadapter/build.gradle.file create mode 100644 moshirudderadapter/build.gradle.kts diff --git a/moshirudderadapter/build.gradle b/moshirudderadapter/build.gradle deleted file mode 100644 index c6275f30..00000000 --- a/moshirudderadapter/build.gradle +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Creator: Debanjan Chatterjee on 30/09/21, 11:41 PM Last modified: 30/09/21, 11:39 PM - * Copyright: All rights reserved Ⓒ 2021 http://rudderstack.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -plugins { - id 'java-library' - id 'kotlin' -} - -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 -} -compileKotlin { - kotlinOptions.jvmTarget = "17" - kotlinOptions.javaParameters = true -} -compileTestKotlin { - kotlinOptions.jvmTarget = "17" - kotlinOptions.javaParameters = true -} - -apply from : "$projectDir/../dependencies.gradle" - - -dependencies { - - implementation(project(path: ":rudderjsonadapter")) - api deps.moshi.kotlin - api deps.moshi.core - //test - testImplementation deps.hamcrest - testImplementation 'junit:junit:4.+' -} -apply from: rootProject.file('gradle/artifacts-jar.gradle') -apply from: rootProject.file('gradle/mvn-publish.gradle') -apply from: rootProject.file('gradle/codecov.gradle') diff --git a/moshirudderadapter/build.gradle.file b/moshirudderadapter/build.gradle.file deleted file mode 100644 index 528c5677..00000000 --- a/moshirudderadapter/build.gradle.file +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Creator: Debanjan Chatterjee on 30/09/21, 11:41 PM Last modified: 30/09/21, 11:39 PM - * Copyright: All rights reserved Ⓒ 2021 http://rudderstack.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -plugins { - id 'java-library' - id 'kotlin' -} -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 -} -compileKotlin { - kotlinOptions.jvmTarget = "17" - kotlinOptions.javaParameters = true -} -compileTestKotlin { - kotlinOptions.jvmTarget = "17" - kotlinOptions.javaParameters = true -} - -apply from : "$projectDir/../dependencies.gradle" - - - -dependencies { - - implementation(project(path: ":rudderjsonadapter")) - api deps.gson - - testImplementation deps.hamcrest - testImplementation 'junit:junit:4.+' -} -apply from: "$projectDir/../gradle/artifacts-jar.gradle" -apply from: "$projectDir/../gradle/mvn-publish.gradle" -apply from: "$projectDir/../gradle/codecov.gradle" diff --git a/moshirudderadapter/build.gradle.kts b/moshirudderadapter/build.gradle.kts new file mode 100644 index 00000000..ca059b87 --- /dev/null +++ b/moshirudderadapter/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + id("java-library") + id("kotlin") +} + +dependencies { + implementation(project(":rudderjsonadapter")) + api(libs.moshi) + api(libs.moshi.kotlin) + testImplementation(libs.junit) + testImplementation(libs.hamcrest) + +} + +apply(from = "${project.projectDir.parentFile}/gradle/artifacts-jar.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/mvn-publish.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/codecov.gradle") From 81ea24738d7bda684be5ad368963d763690d73c4 Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Thu, 23 May 2024 22:34:49 +0300 Subject: [PATCH 10/20] feat: converts repository module build.gradle file to kts --- repository/build.gradle | 76 ------------------------------------ repository/build.gradle.file | 76 ------------------------------------ repository/build.gradle.kts | 60 ++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 152 deletions(-) delete mode 100644 repository/build.gradle delete mode 100644 repository/build.gradle.file create mode 100644 repository/build.gradle.kts diff --git a/repository/build.gradle b/repository/build.gradle deleted file mode 100644 index b4bb147f..00000000 --- a/repository/build.gradle +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Creator: Debanjan Chatterjee on 30/09/21, 11:41 PM Last modified: 30/09/21, 11:39 PM - * Copyright: All rights reserved Ⓒ 2021 http://rudderstack.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -plugins { - id 'com.android.library' - id 'kotlin-android' -} -apply from : "$projectDir/../dependencies.gradle" - -android { - namespace 'com.rudderstack.android.repository' - compileSdk library.target_sdk - - defaultConfig { - minSdk library.min_sdk - targetSdk library.target_sdk - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - kotlinOptions { - jvmTarget = '17' - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } - testOptions { - unitTests { - includeAndroidResources = true - } - } -} - -dependencies { - - testImplementation deps.androidXTestExtJunitKtx - testImplementation deps.androidXTestRules - - testImplementation deps.junit - testImplementation deps.androidXTest - testImplementation deps.hamcrest - testImplementation deps.mockito - testImplementation deps.awaitility - testImplementation deps.robolectric - - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test:rules:1.5.0' - androidTestImplementation deps.androidXTestExtJunitKtx - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' -} -apply from: rootProject.file('gradle/artifacts-aar.gradle') -apply from: rootProject.file('gradle/mvn-publish.gradle') -apply from: rootProject.file('gradle/codecov.gradle') diff --git a/repository/build.gradle.file b/repository/build.gradle.file deleted file mode 100644 index b4bb147f..00000000 --- a/repository/build.gradle.file +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Creator: Debanjan Chatterjee on 30/09/21, 11:41 PM Last modified: 30/09/21, 11:39 PM - * Copyright: All rights reserved Ⓒ 2021 http://rudderstack.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -plugins { - id 'com.android.library' - id 'kotlin-android' -} -apply from : "$projectDir/../dependencies.gradle" - -android { - namespace 'com.rudderstack.android.repository' - compileSdk library.target_sdk - - defaultConfig { - minSdk library.min_sdk - targetSdk library.target_sdk - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - kotlinOptions { - jvmTarget = '17' - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } - testOptions { - unitTests { - includeAndroidResources = true - } - } -} - -dependencies { - - testImplementation deps.androidXTestExtJunitKtx - testImplementation deps.androidXTestRules - - testImplementation deps.junit - testImplementation deps.androidXTest - testImplementation deps.hamcrest - testImplementation deps.mockito - testImplementation deps.awaitility - testImplementation deps.robolectric - - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test:rules:1.5.0' - androidTestImplementation deps.androidXTestExtJunitKtx - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' -} -apply from: rootProject.file('gradle/artifacts-aar.gradle') -apply from: rootProject.file('gradle/mvn-publish.gradle') -apply from: rootProject.file('gradle/codecov.gradle') diff --git a/repository/build.gradle.kts b/repository/build.gradle.kts new file mode 100644 index 00000000..b67dd4b3 --- /dev/null +++ b/repository/build.gradle.kts @@ -0,0 +1,60 @@ +plugins { + id("com.android.library") + id("kotlin-android") +} + +android { + + namespace = "com.rudderstack.android.repository" + compileSdk = RudderstackBuildConfig.Android.TARGET_SDK + + defaultConfig { + minSdk = RudderstackBuildConfig.Android.MIN_SDK + targetSdk = RudderstackBuildConfig.Android.TARGET_SDK + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + named("release") { + isMinifyEnabled = false + setProguardFiles( + listOf( + getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" + ) + ) + } + } + compileOptions { + sourceCompatibility = RudderstackBuildConfig.Build.JAVA_VERSION + targetCompatibility = RudderstackBuildConfig.Build.JAVA_VERSION + } + kotlinOptions { + jvmTarget = RudderstackBuildConfig.Build.JVM_TARGET + javaParameters = true + } + testOptions { + unitTests { + this.isIncludeAndroidResources = true + } + } +} + +dependencies { + + testImplementation(libs.android.x.test.ext.junitktx) + testImplementation(libs.android.x.testrules) + testImplementation(libs.awaitility) + testImplementation(libs.hamcrest) + testImplementation(libs.junit) + testImplementation(libs.mockito.core) + testImplementation(libs.robolectric) + + androidTestImplementation(libs.android.x.test.ext.junitktx) + androidTestImplementation(libs.android.x.test.espresso) + androidTestImplementation(libs.android.x.testrules) +} + +apply(from = "${project.projectDir.parentFile}/gradle/artifacts-aar.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/mvn-publish.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/codecov.gradle") From f388fe64d488c8f9ffee8f9dbc8a0e0e0d19046e Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Thu, 23 May 2024 22:35:17 +0300 Subject: [PATCH 11/20] feat: converts rudderjsonadapter module build.gradle file to kts --- rudderjsonadapter/build.gradle | 43 ----------------------------- rudderjsonadapter/build.gradle.file | 43 ----------------------------- rudderjsonadapter/build.gradle.kts | 13 +++++++++ 3 files changed, 13 insertions(+), 86 deletions(-) delete mode 100644 rudderjsonadapter/build.gradle delete mode 100644 rudderjsonadapter/build.gradle.file create mode 100644 rudderjsonadapter/build.gradle.kts diff --git a/rudderjsonadapter/build.gradle b/rudderjsonadapter/build.gradle deleted file mode 100644 index 02a22140..00000000 --- a/rudderjsonadapter/build.gradle +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Creator: Debanjan Chatterjee on 30/09/21, 11:41 PM Last modified: 30/09/21, 11:39 PM - * Copyright: All rights reserved Ⓒ 2021 http://rudderstack.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -plugins { - id 'java-library' - id 'kotlin' -} - -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 -} -compileKotlin { - kotlinOptions.jvmTarget = "17" - kotlinOptions.javaParameters = true -} -compileTestKotlin { - kotlinOptions.jvmTarget = "17" - kotlinOptions.javaParameters = true -} -apply from : "$projectDir/../dependencies.gradle" - - - -dependencies { - - testImplementation 'junit:junit:4.+' - testImplementation deps.hamcrest -} -apply from: rootProject.file('gradle/artifacts-jar.gradle') -apply from: rootProject.file('gradle/mvn-publish.gradle') -apply from: rootProject.file('gradle/codecov.gradle') diff --git a/rudderjsonadapter/build.gradle.file b/rudderjsonadapter/build.gradle.file deleted file mode 100644 index 02a22140..00000000 --- a/rudderjsonadapter/build.gradle.file +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Creator: Debanjan Chatterjee on 30/09/21, 11:41 PM Last modified: 30/09/21, 11:39 PM - * Copyright: All rights reserved Ⓒ 2021 http://rudderstack.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -plugins { - id 'java-library' - id 'kotlin' -} - -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 -} -compileKotlin { - kotlinOptions.jvmTarget = "17" - kotlinOptions.javaParameters = true -} -compileTestKotlin { - kotlinOptions.jvmTarget = "17" - kotlinOptions.javaParameters = true -} -apply from : "$projectDir/../dependencies.gradle" - - - -dependencies { - - testImplementation 'junit:junit:4.+' - testImplementation deps.hamcrest -} -apply from: rootProject.file('gradle/artifacts-jar.gradle') -apply from: rootProject.file('gradle/mvn-publish.gradle') -apply from: rootProject.file('gradle/codecov.gradle') diff --git a/rudderjsonadapter/build.gradle.kts b/rudderjsonadapter/build.gradle.kts new file mode 100644 index 00000000..3e9e5b17 --- /dev/null +++ b/rudderjsonadapter/build.gradle.kts @@ -0,0 +1,13 @@ +plugins { + id("java-library") + id("kotlin") +} + +dependencies { + testImplementation(libs.junit) + testImplementation(libs.hamcrest) +} + +apply(from = "${project.projectDir.parentFile}/gradle/artifacts-jar.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/mvn-publish.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/codecov.gradle") From 1f077707eedb3aa2668afaeb4a143fc0bec16193 Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Thu, 23 May 2024 22:35:49 +0300 Subject: [PATCH 12/20] feat: converts rudderreporter module build.gradle file to kts --- rudderreporter/build.gradle | 97 --------------------------------- rudderreporter/build.gradle.kts | 88 ++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 97 deletions(-) delete mode 100644 rudderreporter/build.gradle create mode 100644 rudderreporter/build.gradle.kts diff --git a/rudderreporter/build.gradle b/rudderreporter/build.gradle deleted file mode 100644 index e845a71a..00000000 --- a/rudderreporter/build.gradle +++ /dev/null @@ -1,97 +0,0 @@ -plugins { - id 'com.android.library' - id 'kotlin-android' - id 'org.jetbrains.kotlin.android' -} -apply from : "$projectDir/../dependencies.gradle" -android { - namespace 'com.rudderstack.android.ruddermetricsreporterandroid' - compileSdk library.target_sdk - - defaultConfig { - minSdk library.min_sdk - targetSdk library.target_sdk - consumerProguardFiles 'proguard-rules.pro' - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } - kotlinOptions { - jvmTarget = '17' - } - testOptions { - unitTests { - includeAndroidResources = true - } - } -} - -dependencies { - -// implementation deps.kotlinCore - implementation deps.androidXAnnotations - - api(project(path: projects.json_rudder_adapter)) - api(project(projects.repository)) - api(project(path: projects.web)) - api(project(path: projects.moshi_rudder_adapter)) - - compileOnly deps.gson - compileOnly deps.jackson - compileOnly deps.moshi.core - compileOnly deps.moshi.kotlin - compileOnly deps.moshi.adapter - - testImplementation(project(path: projects.moshi_rudder_adapter)) - testImplementation(project(path: projects.gson_rudder_adapter)) - testImplementation(project(path: projects.jackson_rudder_adapter)) - testImplementation deps.moshi.kotlin - testImplementation deps.moshi.core - testImplementation deps.gson - testImplementation deps.jackson - testImplementation deps.androidXTestExtJunitKtx - testImplementation deps.androidXTestRules - testImplementation deps.androidXTest - testImplementation deps.hamcrest - testImplementation deps.mockito - testImplementation deps.mockito_kotlin - testImplementation deps.awaitility - testImplementation deps.robolectric - testImplementation project(path: projects.repository) - - -// androidTestImplementation(project(path: projects.moshi_rudder_adapter)) -// androidTestImplementation(project(path: projects.gson_rudder_adapter)) - androidTestImplementation(project(path: projects.jackson_rudder_adapter)) - androidTestImplementation deps.moshi.kotlin - androidTestImplementation deps.moshi.core -// androidTestImplementation deps.gson -// androidTestImplementation deps.jackson - androidTestImplementation deps.androidXTestExtJunitKtx - androidTestImplementation deps.androidXTestRules - androidTestImplementation deps.androidXTest -// androidTestImplementation deps.hamcrest -// androidTestImplementation deps.mockito -// androidTestImplementation deps.mockito_kotlin - androidTestImplementation deps.androidXTestRunner -// androidTestImplementation('androidx.test.espresso:espresso-contrib:3.5.1') { -// exclude module: "protobuf-lite" -// } -} -apply from: rootProject.file('gradle/artifacts-aar.gradle') -apply from: rootProject.file('gradle/mvn-publish.gradle') -apply from: rootProject.file('gradle/codecov.gradle') diff --git a/rudderreporter/build.gradle.kts b/rudderreporter/build.gradle.kts new file mode 100644 index 00000000..14f659c6 --- /dev/null +++ b/rudderreporter/build.gradle.kts @@ -0,0 +1,88 @@ +plugins { + id("com.android.library") + id("kotlin-android") + id("org.jetbrains.kotlin.android") +} + +android { + + namespace = "com.rudderstack.android.ruddermetricsreporterandroid" + compileSdk = RudderstackBuildConfig.Android.TARGET_SDK + + defaultConfig { + minSdk = RudderstackBuildConfig.Android.MIN_SDK + targetSdk = RudderstackBuildConfig.Android.TARGET_SDK + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + named("release") { + isMinifyEnabled = false + setProguardFiles( + listOf( + getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" + ) + ) + } + } + compileOptions { + sourceCompatibility = RudderstackBuildConfig.Build.JAVA_VERSION + targetCompatibility = RudderstackBuildConfig.Build.JAVA_VERSION + } + kotlinOptions { + jvmTarget = RudderstackBuildConfig.Build.JVM_TARGET + javaParameters = true + } + testOptions { + unitTests { + this.isIncludeAndroidResources = true + } + } +} + +dependencies { + + implementation(libs.android.x.annotation) + + api(project(":rudderjsonadapter")) + api(project(":repository")) + api(project(":web")) + api(project(":moshirudderadapter")) + + compileOnly(libs.gson) + compileOnly(libs.jackson.core) + compileOnly(libs.moshi) + compileOnly(libs.moshi.kotlin) + compileOnly(libs.moshi.adapters) + + testImplementation(project(":moshirudderadapter")) + testImplementation(project(":gsonrudderadapter")) + testImplementation(project(":jacksonrudderadapter")) + testImplementation(project(":repository")) + testImplementation(libs.android.x.test) + testImplementation(libs.android.x.testrules) + testImplementation(libs.android.x.test.ext.junitktx) + testImplementation(libs.awaitility) + testImplementation(libs.gson) + testImplementation(libs.jackson.core) + testImplementation(libs.hamcrest) + testImplementation(libs.junit) + testImplementation(libs.mockito.core) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.moshi) + testImplementation(libs.moshi.kotlin) + testImplementation(libs.robolectric) + + androidTestImplementation(project(":jacksonrudderadapter")) + androidTestImplementation(libs.android.x.test) + androidTestImplementation(libs.android.x.testrules) + androidTestImplementation(libs.android.x.testrunner) + androidTestImplementation(libs.android.x.test.ext.junitktx) + androidTestImplementation(libs.moshi) + androidTestImplementation(libs.moshi.kotlin) +} + +apply(from = "${project.projectDir.parentFile}/gradle/artifacts-aar.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/mvn-publish.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/codecov.gradle") From 612885a2d1f6c96424b9ae7f4814ada6181fb396 Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Thu, 23 May 2024 22:36:27 +0300 Subject: [PATCH 13/20] feat: converts web module build.gradle file to kts --- web/build.gradle | 55 ------------------------------------------- web/build.gradle.file | 55 ------------------------------------------- web/build.gradle.kts | 26 ++++++++++++++++++++ 3 files changed, 26 insertions(+), 110 deletions(-) delete mode 100644 web/build.gradle delete mode 100644 web/build.gradle.file create mode 100644 web/build.gradle.kts diff --git a/web/build.gradle b/web/build.gradle deleted file mode 100644 index 96258e76..00000000 --- a/web/build.gradle +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Creator: Debanjan Chatterjee on 30/09/21, 11:41 PM Last modified: 30/09/21, 11:39 PM - * Copyright: All rights reserved Ⓒ 2021 http://rudderstack.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -plugins { - id 'java-library' - id 'kotlin' -} - -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 -} -compileKotlin { - kotlinOptions.jvmTarget = "17" - kotlinOptions.javaParameters = true -} - -apply from : "$projectDir/../dependencies.gradle" -compileTestKotlin { - kotlinOptions.jvmTarget = "17" - kotlinOptions.javaParameters = true -} - - -dependencies { - - implementation(project(path: ":rudderjsonadapter")) - - //test - testImplementation 'junit:junit:4.13.2' - testImplementation(project(path: ':moshirudderadapter', configuration: 'default')) - testImplementation(project(path: ':gsonrudderadapter', configuration: 'default')) - testImplementation(project(path: ':jacksonrudderadapter', configuration: 'default')) - testImplementation deps.moshi.kotlin - testImplementation deps.moshi.core - testImplementation deps.gson - testImplementation deps.jackson - testImplementation deps.hamcrest - testImplementation deps.mockito - testImplementation deps.awaitility -} -apply from: rootProject.file('gradle/artifacts-jar.gradle') -apply from: rootProject.file('gradle/mvn-publish.gradle') -apply from: rootProject.file('gradle/codecov.gradle') diff --git a/web/build.gradle.file b/web/build.gradle.file deleted file mode 100644 index 96258e76..00000000 --- a/web/build.gradle.file +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Creator: Debanjan Chatterjee on 30/09/21, 11:41 PM Last modified: 30/09/21, 11:39 PM - * Copyright: All rights reserved Ⓒ 2021 http://rudderstack.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -plugins { - id 'java-library' - id 'kotlin' -} - -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 -} -compileKotlin { - kotlinOptions.jvmTarget = "17" - kotlinOptions.javaParameters = true -} - -apply from : "$projectDir/../dependencies.gradle" -compileTestKotlin { - kotlinOptions.jvmTarget = "17" - kotlinOptions.javaParameters = true -} - - -dependencies { - - implementation(project(path: ":rudderjsonadapter")) - - //test - testImplementation 'junit:junit:4.13.2' - testImplementation(project(path: ':moshirudderadapter', configuration: 'default')) - testImplementation(project(path: ':gsonrudderadapter', configuration: 'default')) - testImplementation(project(path: ':jacksonrudderadapter', configuration: 'default')) - testImplementation deps.moshi.kotlin - testImplementation deps.moshi.core - testImplementation deps.gson - testImplementation deps.jackson - testImplementation deps.hamcrest - testImplementation deps.mockito - testImplementation deps.awaitility -} -apply from: rootProject.file('gradle/artifacts-jar.gradle') -apply from: rootProject.file('gradle/mvn-publish.gradle') -apply from: rootProject.file('gradle/codecov.gradle') diff --git a/web/build.gradle.kts b/web/build.gradle.kts new file mode 100644 index 00000000..825e2c60 --- /dev/null +++ b/web/build.gradle.kts @@ -0,0 +1,26 @@ +plugins { + id("java-library") + id("kotlin") +} + +dependencies { + + implementation(project(":rudderjsonadapter")) + + testImplementation(libs.awaitility) + testImplementation(libs.gson) + testImplementation(libs.hamcrest) + testImplementation(libs.jackson.core) + testImplementation(libs.junit) + testImplementation(libs.mockito.core) + testImplementation(libs.moshi) + testImplementation(libs.moshi.kotlin) + + testImplementation(project(":moshirudderadapter")) + testImplementation(project(":gsonrudderadapter")) + testImplementation(project(":jacksonrudderadapter")) +} + +apply(from = "${project.projectDir.parentFile}/gradle/artifacts-jar.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/mvn-publish.gradle") +apply(from = "${project.projectDir.parentFile}/gradle/codecov.gradle") From 6d9cd88399f5eb1828c2b27d786f762f7f0a5864 Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Thu, 23 May 2024 22:37:19 +0300 Subject: [PATCH 14/20] feat: converts project build.gradle file to kts --- build.gradle | 46 ---------------------------------------------- build.gradle.kts | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 46 deletions(-) delete mode 100644 build.gradle create mode 100644 build.gradle.kts diff --git a/build.gradle b/build.gradle deleted file mode 100644 index a690abbb..00000000 --- a/build.gradle +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Creator: Debanjan Chatterjee on 30/09/21, 11:41 PM Last modified: 30/09/21, 11:39 PM - * Copyright: All rights reserved Ⓒ 2021 http://rudderstack.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -// Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - ext { - compose_version = '1.4.8' - } - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:8.2.2' - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} -plugins { - id("io.github.gradle-nexus.publish-plugin") version "1.3.0" - id 'org.jetbrains.kotlin.android' version '1.8.22' apply false - id 'org.jetbrains.kotlin.jvm' version '1.8.22' apply false -} - -task clean(type: Delete) { - delete rootProject.buildDir -} -apply from: rootProject.file('gradle/promote.gradle') -apply from: rootProject.file('gradle/codecov.gradle') -subprojects { - group GROUP - version getVersionName(VERSION_NAME) -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 00000000..a8382c80 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,28 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + extra["compose_version"] = RudderstackBuildConfig.Kotlin.COMPILER_EXTENSION_VERSION + repositories { + google() + mavenCentral() + } + dependencies { + classpath(libs.gradle) + classpath(libs.kotlin.gradle.plugin) + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle.kts files + } +} + +plugins { + alias(libs.plugins.gradle.nexus.publish) + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.kotlin.jvm) apply false +} + +subprojects { + version = properties[RudderstackBuildConfig.ReleaseInfo.VERSION_NAME].toString() + group = properties[RudderstackBuildConfig.ReleaseInfo.GROUP_NAME].toString() +} + +apply(from = rootProject.file("gradle/promote.gradle")) +apply(from = rootProject.file("gradle/codecov.gradle")) From b8ff3419371579b12dc08a0cbe48efaa92b767bd Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Thu, 23 May 2024 22:38:10 +0300 Subject: [PATCH 15/20] feat: converts settings.gradle file to kts --- settings.gradle | 45 --------------------------------------------- settings.gradle.kts | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 45 deletions(-) delete mode 100644 settings.gradle create mode 100644 settings.gradle.kts diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 9df85967..00000000 --- a/settings.gradle +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Creator: Debanjan Chatterjee on 30/09/21, 11:41 PM Last modified: 30/09/21, 11:39 PM - * Copyright: All rights reserved Ⓒ 2021 http://rudderstack.com - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) - repositories { - gradlePluginPortal() - google() - mavenCentral() - maven { url = "https://maven.pkg,space/public/p/compose/dev" } - maven { - url = uri("https://plugins.gradle.org/m2/") - } - jcenter() // Warning: this repository is going to shut down soon - } -} - -rootProject.name = "Rudder-Android-Libs" -//include ':app' -include ':core' -include ':android' -include ':web' -include ':gsonrudderadapter' -include ':repository' -include ':models' -include ':rudderjsonadapter' -include ':rudderreporter' -include ':jacksonrudderadapter' -include ':moshirudderadapter' -include ':libs:navigationplugin' -//include ':libs:testcommon' -include ':libs:test-common' -include ':libs:sync' -include ':samples:sample-kotlin-android' diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..6e8d4858 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,30 @@ +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + gradlePluginPortal() + google() + mavenCentral() + maven { setUrl("https://maven.pkg,space/public/p/compose/dev") } + maven { url = uri("https://plugins.gradle.org/m2/") } + jcenter() // Warning: this repository is going to shut down soon + } +} + +rootProject.name = "Rudder-Android-Libs" + +include( + ":core", + ":android", + ":web", + ":gsonrudderadapter", + ":repository", + ":models", + ":rudderjsonadapter", + ":rudderreporter", + ":jacksonrudderadapter", + ":moshirudderadapter", + ":libs:navigationplugin", + ":libs:test-common", + ":libs:sync", + ":samples:sample-kotlin-android", +) From 097cd1eff5c838c5f7e0526ebf6df3f0a4396c9b Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Thu, 23 May 2024 22:39:46 +0300 Subject: [PATCH 16/20] feat: minor changes to build.gradle.kts of navigationplugin --- libs/navigationplugin/build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/navigationplugin/build.gradle.kts b/libs/navigationplugin/build.gradle.kts index 3d8dd2b3..e9d2864a 100644 --- a/libs/navigationplugin/build.gradle.kts +++ b/libs/navigationplugin/build.gradle.kts @@ -44,12 +44,12 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = RudderstackBuildConfig.Build.JAVA_VERSION + targetCompatibility = RudderstackBuildConfig.Build.JAVA_VERSION } kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() + jvmTarget = RudderstackBuildConfig.Build.JAVA_VERSION.toString() javaParameters = true } namespace = "com.rudderstack.android.navigationplugin" From c3144d6c673a02757935f662245103ec40d81337 Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Thu, 23 May 2024 22:40:04 +0300 Subject: [PATCH 17/20] feat: minor changes to build.gradle.kts of test-common --- libs/test-common/build.gradle.kts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/libs/test-common/build.gradle.kts b/libs/test-common/build.gradle.kts index 350de790..28cc599e 100644 --- a/libs/test-common/build.gradle.kts +++ b/libs/test-common/build.gradle.kts @@ -16,20 +16,16 @@ plugins { id("java-library") id("org.jetbrains.kotlin.jvm") } -val dependencyPath = "${project.projectDir.parentFile.parent}/dependencies.gradle" -apply(from = dependencyPath) -val deps : HashMap by extra -val library : HashMap by extra -val projects : HashMap by extra + java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = RudderstackBuildConfig.Build.JAVA_VERSION + targetCompatibility = RudderstackBuildConfig.Build.JAVA_VERSION } tasks.withType().all { kotlinOptions { - jvmTarget = "17" + jvmTarget = RudderstackBuildConfig.Build.JVM_TARGET } } dependencies { - compileOnly(project(projects["core"].toString())) + compileOnly(project(":core")) } From 17d887c7637ceee00b738702bf297d20a3537935 Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Thu, 23 May 2024 22:40:15 +0300 Subject: [PATCH 18/20] feat: minor changes to build.gradle.kts of sample kotlin --- .../sample-kotlin-android/build.gradle.kts | 103 +++++++----------- 1 file changed, 39 insertions(+), 64 deletions(-) diff --git a/samples/sample-kotlin-android/build.gradle.kts b/samples/sample-kotlin-android/build.gradle.kts index c858b9b2..0baa4d88 100644 --- a/samples/sample-kotlin-android/build.gradle.kts +++ b/samples/sample-kotlin-android/build.gradle.kts @@ -13,15 +13,10 @@ val sampleRudderProperties = Properties().apply { } android { - val majorVersion = 0 - val minVersion = 1 - val patchVersion = 0 - val libraryVersionName = "${majorVersion}.${minVersion}.${patchVersion}" - val libraryVersionCode = majorVersion * 1000 + minVersion * 100 + patchVersion - val javaVersion = JavaVersion.VERSION_17 + val javaVersion = RudderstackBuildConfig.Build.JAVA_VERSION val jvm = 17 - val composeCompilerVersion = "1.4.8" - val androidCompileSdkVersion = 34 + val composeCompilerVersion = RudderstackBuildConfig.Kotlin.COMPILER_EXTENSION_VERSION + val androidCompileSdkVersion = RudderstackBuildConfig.Android.COMPILE_SDK val androidMinSdkVersion = 26 compileSdk = androidCompileSdkVersion @@ -30,8 +25,6 @@ android { applicationId = "com.rudderstack.android.sampleapp" minSdk = androidMinSdkVersion targetSdk = androidCompileSdkVersion - versionCode = libraryVersionCode - versionName = libraryVersionName testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { @@ -89,7 +82,7 @@ android { targetCompatibility = javaVersion } kotlinOptions { - jvmTarget = "17" + jvmTarget = RudderstackBuildConfig.Build.JVM_TARGET javaParameters = true } java { @@ -98,60 +91,42 @@ android { } } buildFeatures { - compose = true - } - composeOptions { - kotlinCompilerExtensionVersion = composeCompilerVersion - } - tasks.withType { - useJUnitPlatform() - } - namespace = "com.rudderstack.android.sampleapp" - - buildFeatures { - buildConfig = true + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = composeCompilerVersion + } + tasks.withType { + useJUnitPlatform() + } + namespace = "com.rudderstack.android.sampleapp" } -} -dependencies { - implementation("androidx.core:core-ktx:1.12.0") - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.11.0") - //compose - implementation("androidx.compose.ui:ui:1.4.3") - // Tooling support (Previews, etc.) - implementation("androidx.compose.ui:ui-tooling:1.4.3") - // Foundation (Border, Background, Box, Image, Scroll, shapes, animations, etc.) - implementation("androidx.compose.foundation:foundation:1.4.3") - // Material Design - implementation("androidx.compose.material:material:1.4.3") - // Material design icons - implementation("androidx.compose.material:material-icons-core:1.4.3") - implementation("androidx.compose.material:material-icons-extended:1.4.3") - // Integration with activities - implementation("androidx.activity:activity-compose:1.8.2") - // Integration with ViewModels - implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2") - // Integration with observables - implementation("androidx.compose.runtime:runtime-livedata:1.4.3") - implementation("androidx.compose.ui:ui-tooling-preview:1.4.3") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") + dependencies { + implementation("com.google.android.material:material:1.12.0") + //compose + implementation("androidx.compose.ui:ui:1.6.7") + implementation("androidx.compose.ui:ui-tooling-preview:1.6.7") + implementation("androidx.compose.ui:ui-tooling:1.6.7") + implementation("androidx.compose.foundation:foundation:1.6.7") + // Material Design + implementation("androidx.compose.material:material:1.6.7") + // Integration with activities + implementation("androidx.activity:activity-compose:1.9.0") + // Integration with ViewModels + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.0") - implementation(project(":android")) - implementation(project(":moshirudderadapter")) - implementation(project(":gsonrudderadapter")) - implementation(project(":jacksonrudderadapter")) - implementation(project(":repository")) - implementation(project(":core")) - implementation(project(":models")) - implementation(project(":web")) - implementation(project(":rudderreporter")) - implementation(project(":libs:sync")) - implementation(project(":libs:navigationplugin")) - - - testImplementation("junit:junit:4.13.2") - androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") - androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.5.4") - debugImplementation("androidx.compose.ui:ui-test-manifest:1.5.4") + implementation(project(":android")) + implementation(project(":moshirudderadapter")) + implementation(project(":gsonrudderadapter")) + implementation(project(":jacksonrudderadapter")) + implementation(project(":repository")) + implementation(project(":core")) + implementation(project(":models")) + implementation(project(":web")) + implementation(project(":rudderreporter")) + implementation(project(":libs:sync")) + implementation(project(":libs:navigationplugin")) + } } From fc8e1dc9869812bc734a7ec0a025584da7402909 Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Mon, 10 Jun 2024 10:30:57 +0300 Subject: [PATCH 19/20] feat: adding back the versionCode and versionName of the sample app --- samples/sample-kotlin-android/build.gradle.kts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/samples/sample-kotlin-android/build.gradle.kts b/samples/sample-kotlin-android/build.gradle.kts index 0baa4d88..ed548c95 100644 --- a/samples/sample-kotlin-android/build.gradle.kts +++ b/samples/sample-kotlin-android/build.gradle.kts @@ -18,6 +18,11 @@ android { val composeCompilerVersion = RudderstackBuildConfig.Kotlin.COMPILER_EXTENSION_VERSION val androidCompileSdkVersion = RudderstackBuildConfig.Android.COMPILE_SDK val androidMinSdkVersion = 26 + val majorVersion = 0 + val minVersion = 1 + val patchVersion = 0 + val libraryVersionName = "${majorVersion}.${minVersion}.${patchVersion}" + val libraryVersionCode = majorVersion * 1000 + minVersion * 100 + patchVersion compileSdk = androidCompileSdkVersion @@ -25,6 +30,8 @@ android { applicationId = "com.rudderstack.android.sampleapp" minSdk = androidMinSdkVersion targetSdk = androidCompileSdkVersion + versionCode = libraryVersionCode + versionName = libraryVersionName testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { From 54014d559a6d6f7f207f159687238f01ad08388a Mon Sep 17 00:00:00 2001 From: Chryssa Aliferi Date: Tue, 18 Jun 2024 11:10:52 +0300 Subject: [PATCH 20/20] feat: merge commit tackling conflicts --- settings.gradle | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 settings.gradle diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index e69de29b..00000000