Skip to content

Commit 6bc3df2

Browse files
committed
Migrate missed plugins
1 parent f51ed20 commit 6bc3df2

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

core-sdk-samples/higgs-shop-sample-app/app/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import java.util.Date
33
import java.util.TimeZone
44

55
plugins {
6-
id("com.android.application")
7-
id("org.jlleitschuh.gradle.ktlint") version "11.0.0"
6+
alias(libs.plugins.android.application)
7+
alias(libs.plugins.ktlint)
88
// id("com.google.gms.google-services")
9-
kotlin("android")
10-
id("com.google.devtools.ksp")
9+
alias(libs.plugins.kotlin.android)
10+
alias(libs.plugins.ksp)
1111
}
1212

1313
android {

core-sdk-samples/higgs-shop-sample-app/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath(libs.gradle)
10-
classpath(libs.kotlin.gradle.plugin)
119
classpath(libs.google.services)
1210
}
1311
}
1412

1513
plugins {
14+
alias(libs.plugins.android.application) apply false
15+
alias(libs.plugins.kotlin.android) apply false
1616
alias(libs.plugins.ksp) apply false
17+
alias(libs.plugins.ktlint) apply false
1718
}
1819

1920
tasks.register("clean", Delete::class) {

gradle/libs.versions.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[versions]
2+
androidGradlePlugin = "8.6.1"
23
androidxConstraintlayout = "2.1.4"
34
androidxFragmentKtxVersion = "1.6.2"
45
androidxLifecycleViewmodelKtx = "2.7.0"
@@ -15,14 +16,14 @@ coreKtx = "1.12.0"
1516
espressoCore = "3.5.1"
1617
glide = "4.16.0"
1718
googleServices = "4.3.14"
18-
gradle = "8.6.1"
1919
gson = "2.10.1"
2020
junit = "4.13.2"
2121
junitVersion = "1.1.5"
2222
junitKtx = "1.1.5"
2323
kotlinGradlePlugin = "1.9.25"
2424
kotlinxCoroutinesBom = "1.7.3"
2525
ksp = "1.9.25-1.0.20"
26+
ktlint = "11.0.0"
2627
lifecycleLivedataKtxVersion = "2.7.0"
2728
lifecycleRuntimeKtx = "2.7.0"
2829
material = "1.11.0"
@@ -57,10 +58,8 @@ com-squareup-retrofit = { module = "com.squareup.retrofit2:retrofit", version.re
5758
compiler-glide = { module = "com.github.bumptech.glide:compiler", version.ref = "compiler" }
5859
glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
5960
google-services = { module = "com.google.gms:google-services", version.ref = "googleServices" }
60-
gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
6161
gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
6262
junit = { module = "junit:junit", version.ref = "junit" }
63-
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinGradlePlugin" }
6463
kotlinx-coroutines-bom = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-bom", version.ref = "kotlinxCoroutinesBom" }
6564
lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycleLivedataKtxVersion" }
6665
material = { module = "com.google.android.material:material", version.ref = "material" }
@@ -74,3 +73,6 @@ squareup-logging-interceptor = { module = "com.squareup.okhttp3:logging-intercep
7473

7574
[plugins]
7675
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
76+
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
77+
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
78+
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinGradlePlugin" }

settings.gradle.kts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
pluginManagement {
2+
repositories {
3+
google()
4+
mavenCentral()
5+
gradlePluginPortal()
6+
}
7+
}
8+
19
dependencyResolutionManagement {
210
repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
311
repositories {

0 commit comments

Comments
 (0)