Merge pull request #7 from jacobras/settings-gradle-kotlin-dsl

jacobras · web-flow · commit b6b9ace826d8 · 2023-07-08T15:50:43.000+02:00
Migrate settings to Kotlin Gradle DSL
diff --git a/compose-action-menu/build.gradle.kts b/compose-action-menu/build.gradle.kts
@@ -6,7 +6,6 @@ import org.gradle.kotlin.dsl.libs
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
-    id("maven-publish")
 }
 
 android {
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,3 +1,5 @@
+@file:Suppress("UnstableApiUsage")
+
 pluginManagement {
     repositories {
         gradlePluginPortal()
@@ -13,5 +15,5 @@ dependencyResolutionManagement {
     }
 }
 rootProject.name = "ComposeActionMenu"
-include ':sample-app'
-include ':compose-action-menu'
+include(":sample-app")
+include(":compose-action-menu")

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ import org.gradle.kotlin.dsl.libs`
`6`	`6`	`plugins {`
`7`	`7`	`id("com.android.library")`
`8`	`8`	`id("org.jetbrains.kotlin.android")`
`9`		`- id("maven-publish")`
`10`	`9`	`}`
`11`	`10`
`12`	`11`	`android {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+@file:Suppress("UnstableApiUsage")`
	`2`	`+`
`1`	`3`	`pluginManagement {`
`2`	`4`	`repositories {`
`3`	`5`	`gradlePluginPortal()`
`@@ -13,5 +15,5 @@ dependencyResolutionManagement {`
`13`	`15`	`}`
`14`	`16`	`}`
`15`	`17`	`rootProject.name = "ComposeActionMenu"`
`16`		`-include ':sample-app'`
`17`		`-include ':compose-action-menu'`
	`18`	`+include(":sample-app")`
	`19`	`+include(":compose-action-menu")`