diff options
Diffstat (limited to 'android/buildSrc/src')
| -rw-r--r-- | android/buildSrc/src/main/kotlin/Dependencies.kt | 206 | ||||
| -rw-r--r-- | android/buildSrc/src/main/kotlin/Projects.kt | 3 | ||||
| -rw-r--r-- | android/buildSrc/src/main/kotlin/Versions.kt | 80 |
3 files changed, 18 insertions, 271 deletions
diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt index 367837caee..066c065f46 100644 --- a/android/buildSrc/src/main/kotlin/Dependencies.kt +++ b/android/buildSrc/src/main/kotlin/Dependencies.kt @@ -1,197 +1,15 @@ object Dependencies { - const val androidVolley = "com.android.volley:volley:${Versions.Android.volley}" - const val commonsValidator = "commons-validator:commons-validator:${Versions.commonsValidator}" - const val jodaTime = "joda-time:joda-time:${Versions.jodaTime}" - const val junitApi = "org.junit.jupiter:junit-jupiter-api:${Versions.junit}" - const val junitEngine = "org.junit.jupiter:junit-jupiter-engine:${Versions.junit}" - const val junitParams = "org.junit.jupiter:junit-jupiter-params:${Versions.junit}" - const val junitAndroidTestExtensions = - "de.mannodermaus.junit5:android-test-core:${Versions.Android.junit}" - const val junitAndroidTestCore = - "de.mannodermaus.junit5:android-test-extensions:${Versions.Android.junit}" - const val junitAndroidTestRunner = - "de.mannodermaus.junit5:android-test-runner:${Versions.Android.junit}" - const val kermit = "co.touchlab:kermit:${Versions.kermit}" - const val konsist = "com.lemonappdev:konsist:${Versions.konsist}" - const val leakCanary = "com.squareup.leakcanary:leakcanary-android:${Versions.leakCanary}" - const val mockkWebserver = "com.squareup.okhttp3:mockwebserver:${Versions.mockWebserver}" - const val turbine = "app.cash.turbine:turbine:${Versions.turbine}" - const val billingClient = "com.android.billingclient:billing-ktx:${Versions.billingClient}" + const val junitJupiterApi = "org.junit.jupiter:junit-jupiter-api:${Versions.junitJupiter}" + const val junitJupiterEngine = "org.junit.jupiter:junit-jupiter-engine:${Versions.junitJupiter}" + const val junitJupiterParams = "org.junit.jupiter:junit-jupiter-params:${Versions.junitJupiter}" - object AndroidX { - const val activityCompose = - "androidx.activity:activity-compose:${Versions.AndroidX.activityCompose}" - const val appcompat = "androidx.appcompat:appcompat:${Versions.AndroidX.appcompat}" - const val coreKtx = "androidx.core:core-ktx:${Versions.AndroidX.coreKtx}" - const val coreSplashscreen = "androidx.core:core-splashscreen:${Versions.AndroidX.coreSplashscreen}" - const val lifecycleRuntimeKtx = - "androidx.lifecycle:lifecycle-runtime-ktx:${Versions.AndroidX.lifecycle}" - const val lifecycleViewmodelKtx = - "androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.AndroidX.lifecycle}" - const val lifecycleRuntimeCompose = - "androidx.lifecycle:lifecycle-runtime-compose:${Versions.AndroidX.lifecycle}" - const val lifecycleService = - "androidx.lifecycle:lifecycle-service:${Versions.AndroidX.lifecycle}" - const val espressoCore = - "androidx.test.espresso:espresso-core:${Versions.AndroidX.espresso}" - const val testCore = "androidx.test:core:${Versions.AndroidX.test}" - const val testMonitor = "androidx.test:monitor:${Versions.AndroidX.testMonitor}" - const val testRunner = "androidx.test:runner:${Versions.AndroidX.testRunner}" - const val testRules = "androidx.test:rules:${Versions.AndroidX.test}" - const val testUiAutomator = - "androidx.test.uiautomator:uiautomator:${Versions.AndroidX.uiautomator}" - const val testOrchestrator = - "androidx.test:orchestrator:${Versions.AndroidX.testOrchestrator}" - } - - object Arrow { - const val core = "io.arrow-kt:arrow-core:${Versions.Arrow.base}" - const val optics = "io.arrow-kt:arrow-optics:${Versions.Arrow.base}" - const val opticsKsp = "io.arrow-kt:arrow-optics-ksp-plugin:${Versions.Arrow.base}" - const val resilience = "io.arrow-kt:arrow-resilience:${Versions.Arrow.base}" - } - - object Compose { - const val constrainLayout = - "androidx.constraintlayout:constraintlayout-compose:${Versions.Compose.constrainLayout}" - const val destinations = - "io.github.raamcosta.compose-destinations:core:${Versions.Compose.destinations}" - const val destinationsKsp = - "io.github.raamcosta.compose-destinations:ksp:${Versions.Compose.destinations}" - const val foundation = - "androidx.compose.foundation:foundation:${Versions.Compose.foundation}" - const val junit5 = "de.mannodermaus.junit5:android-test-compose:${Versions.Android.junit}" - const val material3 = "androidx.compose.material3:material3:${Versions.Compose.material3}" - const val testManifest = "androidx.compose.ui:ui-test-manifest:${Versions.Compose.base}" - const val ui = "androidx.compose.ui:ui:${Versions.Compose.base}" - const val uiTestManifest = "androidx.compose.ui:ui-test-manifest:${Versions.Compose.base}" - const val uiTooling = "androidx.compose.ui:ui-tooling:${Versions.Compose.base}" - const val uiToolingAndroidPreview = - "androidx.compose.ui:ui-tooling-preview-android:${Versions.Compose.base}" - const val uiToolingPreview = - "androidx.compose.ui:ui-tooling-preview:${Versions.Compose.base}" - const val uiUtil = "androidx.compose.ui:ui-util:${Versions.Compose.base}" - } - - object Grpc { - const val grpcOkHttp = "io.grpc:grpc-okhttp:${Versions.Grpc.grpcVersion}" - const val grpcAndroid = "io.grpc:grpc-android:${Versions.Grpc.grpcVersion}" - const val grpcKotlinStub = "io.grpc:grpc-kotlin-stub:${Versions.Grpc.grpcKotlinVersion}" - const val protobufLite = "io.grpc:grpc-protobuf-lite:${Versions.Grpc.grpcVersion}" - const val protobufKotlinLite = - "com.google.protobuf:protobuf-kotlin-lite:${Versions.Grpc.protobufVersion}" - } - - object Koin { - const val core = "io.insert-koin:koin-core:${Versions.Koin.base}" - const val android = "io.insert-koin:koin-android:${Versions.Koin.base}" - const val compose = "io.insert-koin:koin-androidx-compose:${Versions.Koin.compose}" - const val test = "io.insert-koin:koin-test:${Versions.Koin.base}" - } - - object Kotlin { - const val reflect = "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}" - const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}" - const val test = "org.jetbrains.kotlin:kotlin-test:${Versions.kotlin}" - - const val kotlinNavtivePrebuiltWindowsX86_64 = - "org.jetbrains.kotlin:kotlin-native-prebuilt:${Versions.kotlin}:windows-x86_64@zip" - const val kotlinNavtivePrebuiltLinuxX86_64 = - "org.jetbrains.kotlin:kotlin-native-prebuilt:${Versions.kotlin}:linux-x86_64@tar.gz" - const val kotlinNavtivePrebuiltMacOsAArch64 = - "org.jetbrains.kotlin:kotlin-native-prebuilt:${Versions.kotlin}:macos-aarch64@tar.gz" - const val kotlinNavtivePrebuiltMacOsX86_64 = - "org.jetbrains.kotlin:kotlin-native-prebuilt:${Versions.kotlin}:macos-x86_64@tar.gz" - } - - object KotlinX { - const val coroutinesCore = - "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.kotlinx}" - const val coroutinesAndroid = - "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.kotlinx}" - const val coroutinesTest = - "org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.kotlinx}" - } - - object MockK { - const val core = "io.mockk:mockk:${Versions.mockk}" - const val android = "io.mockk:mockk-android:${Versions.mockk}" - } - - object Mullvad { - const val daemonGrpc = ":lib:daemon-grpc" - const val vpnService = ":service" - const val tileService = ":tile" - - const val commonLib = ":lib:common" - const val endpointLib = ":lib:endpoint" - const val modelLib = ":lib:model" - const val resourceLib = ":lib:resource" - const val talpidLib = ":lib:talpid" - const val themeLib = ":lib:theme" - const val commonTestLib = ":lib:common-test" - const val billingLib = ":lib:billing" - const val paymentLib = ":lib:payment" - const val mapLib = ":lib:map" - const val sharedLib = ":lib:shared" - const val intentLib = ":lib:intent-provider" - } - - object Plugin { - // The aapt* plugin versions must be in sync with the android plugin version. - // Required for Gradle metadata verification to work properly, see: - // https://github.com/gradle/gradle/issues/19228 - const val aaptLinux = "com.android.tools.build:aapt2:${Versions.Plugin.androidAapt}:linux" - const val aaptOsx = "com.android.tools.build:aapt2:${Versions.Plugin.androidAapt}:osx" - const val aaptWindows = - "com.android.tools.build:aapt2:${Versions.Plugin.androidAapt}:windows" - const val android = "com.android.tools.build:gradle:${Versions.Plugin.android}" - const val androidApplicationId = "com.android.application" - const val androidLibraryId = "com.android.library" - const val androidTestId = "com.android.test" - const val dependencyCheck = - "org.owasp:dependency-check-gradle:${Versions.Plugin.dependencyCheck}" - const val dependencyCheckId = "org.owasp.dependencycheck" - const val detektId = "io.gitlab.arturbosch.detekt" - const val composeCompiler = "org.jetbrains.kotlin.plugin.compose" - const val gradleVersionsId = "com.github.ben-manes.versions" - const val junit5 = "de.mannodermaus.android-junit5" - const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}" - const val kotlinAndroidId = "kotlin-android" - const val kotlinParcelizeId = "kotlin-parcelize" - const val ksp = "com.google.devtools.ksp" - const val ktfmtId = "com.ncorti.ktfmt.gradle" - const val playPublisher = - "com.github.triplet.gradle:play-publisher:${Versions.Plugin.playPublisher}" - const val playPublisherId = "com.github.triplet.play" - - object Protobuf { - const val protobufId = "com.google.protobuf" - const val protocGenGrpcJava = - "io.grpc:protoc-gen-grpc-java:${Versions.Grpc.grpcVersion}" - const val protoc = "com.google.protobuf:protoc:${Versions.Grpc.protobufVersion}" - const val protocGenGrpcKotlin = - "io.grpc:protoc-gen-grpc-kotlin:${Versions.Grpc.grpcKotlinVersion}:jdk8@jar" - - const val protocGenGrpcJavaLinuxAarch_64 = "$protocGenGrpcJava:linux-aarch_64@exe" - const val protocGenGrpcJavaLinuxPpcle_64 = "$protocGenGrpcJava:linux-ppcle_64@exe" - const val protocGenGrpcJavaLinuxS390_64 = "$protocGenGrpcJava:linux-s390_64@exe" - const val protocGenGrpcJavaLinuxX86_32 = "$protocGenGrpcJava:linux-x86_32@exe" - const val protocGenGrpcJavaLinuxX86_64 = "$protocGenGrpcJava:linux-x86_64@exe" - const val protocGenGrpcJavaOsxAarch_64 = "$protocGenGrpcJava:osx-aarch_64@exe" - const val protocGenGrpcJavaOsxX86_64 = "$protocGenGrpcJava:osx-x86_64@exe" - const val protocGenGrpcJavaWindowsX86_32 = "$protocGenGrpcJava:windows-x86_32@exe" - const val protocGenGrpcJavaWindowsX86_64 = "$protocGenGrpcJava:windows-x86_64@exe" - - const val protocLinuxAarch_64 = "$protoc:linux-aarch_64@exe" - const val protocLinuxPpcle_64 = "$protoc:linux-ppcle_64@exe" - const val protocLinuxS390_64 = "$protoc:linux-s390_64@exe" - const val protocLinuxX86_32 = "$protoc:linux-x86_32@exe" - const val protocLinuxX86_64 = "$protoc:linux-x86_64@exe" - const val protocOsxAarch_64 = "$protoc:osx-aarch_64@exe" - const val protocOsxX86_64 = "$protoc:osx-x86_64@exe" - const val protocWindowsX86_32 = "$protoc:windows-x86_32@exe" - const val protocWindowsX86_64 = "$protoc:windows-x86_64@exe" - } - } + const val junit5AndroidPluginId = "de.mannodermaus.android-junit5" + const val junit5AndroidTestCompose = + "de.mannodermaus.junit5:android-test-compose:${Versions.junit5Android}" + const val junit5AndroidTestCore = + "de.mannodermaus.junit5:android-test-core:${Versions.junit5Android}" + const val junit5AndroidTestExtensions = + "de.mannodermaus.junit5:android-test-extensions:${Versions.junit5Android}" + const val junit5AndroidTestRunner = + "de.mannodermaus.junit5:android-test-runner:${Versions.junit5Android}" } diff --git a/android/buildSrc/src/main/kotlin/Projects.kt b/android/buildSrc/src/main/kotlin/Projects.kt deleted file mode 100644 index 7558674654..0000000000 --- a/android/buildSrc/src/main/kotlin/Projects.kt +++ /dev/null @@ -1,3 +0,0 @@ -object Projects { - const val testCommon = ":test:common" -} diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index a985889254..432a66e9b8 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -1,78 +1,10 @@ object Versions { - const val commonsValidator = "1.9.0" - const val jodaTime = "2.12.7" - const val junit = "5.10.2" const val jvmTarget = "17" - const val kermit = "2.0.4" - const val konsist = "0.15.1" - const val kotlin = "2.0.0" - const val kotlinx = "1.8.1" - const val leakCanary = "2.13" - const val mockk = "1.13.12" - const val mockWebserver = "4.12.0" - const val turbine = "1.1.0" - const val billingClient = "6.2.0" + const val compileSdkVersion = 34 + const val minSdkVersion = 26 + const val targetSdkVersion = 34 - object Android { - const val compileSdkVersion = 34 - const val junit = "1.5.0" - const val minSdkVersion = 26 - const val targetSdkVersion = 34 - const val volley = "1.2.1" - } - - object AndroidX { - const val activityCompose = "1.9.1" - const val appcompat = "1.7.0" - const val coreKtx = "1.13.1" - const val coreSplashscreen = "1.1.0-rc01" - const val espresso = "3.6.1" - const val lifecycle = "2.8.4" - const val test = "1.6.1" - const val testMonitor = "1.7.1" - const val testOrchestrator = "1.5.0" - const val testRunner = "1.6.1" - const val uiautomator = "2.4.0-alpha01" - } - - object Arrow { - const val base = "1.2.4" - } - - object Compose { - const val base = "1.7.0-beta06" - const val destinations = "2.1.0-beta10" - const val constrainLayout = "1.0.1" - const val foundation = base - const val material3 = "1.3.0-beta04" - } - - object Grpc { - const val grpcVersion = "1.65.1" - const val grpcKotlinVersion = "1.4.1" - const val protobufVersion = "4.27.2" - } - - object Plugin { - // The androidAapt plugin version must be in sync with the android plugin version. - // Required for Gradle metadata verification to work properly, see: - // https://github.com/gradle/gradle/issues/19228 - const val android = "8.3.0" - const val androidAapt = "$android-10880808" - const val playPublisher = "3.9.0" - const val protobuf = "0.9.4" - const val dependencyCheck = "10.0.3" - const val detekt = "1.23.6" - const val gradleVersions = "0.51.0" - const val junit5 = "1.10.2.0" - const val ktfmt = "0.17.0" - // Ksp version is linked with kotlin version, find matching release here: - // https://github.com/google/ksp/releases - const val ksp = "${kotlin}-1.0.22" - } - - object Koin { - const val base = "3.5.6" - const val compose = "3.5.6" - } + const val junitJupiter = "5.10.2" + const val junit5Android = "1.5.0" + const val junit5Plugin = "1.10.2.0" } |