Place android build flavours into one package

crc-32 · crc-32 · commit fd4ee8bd1de4 · 2021-02-14T22:38:30.000Z
diff --git a/build.gradle b/build.gradle
@@ -68,6 +68,8 @@ android { // android specific configuration
             res.srcDirs = ['src/androidMain/res']
         }
     }
+    publishNonDefault true
+    defaultPublishConfig "release"
 }
 
 dependencies {
@@ -87,7 +89,8 @@ kotlin {
     }
     // use the android preset
     android {
-        publishLibraryVariants("release", "debug")
+
+        publishLibraryVariantsGroupedByFlavor = true
     }
 
     sourceSets {
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 kotlin.code.style=official
 
 group=io.rebble.libpebblecommon
-version=0.0.17
+version=0.0.18
 org.gradle.jvmargs=-Xms1G

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,8 @@ android { // android specific configuration`
`68`	`68`	`res.srcDirs = ['src/androidMain/res']`
`69`	`69`	`}`
`70`	`70`	`}`
	`71`	`+ publishNonDefault true`
	`72`	`+ defaultPublishConfig "release"`
`71`	`73`	`}`
`72`	`74`
`73`	`75`	`dependencies {`
`@@ -87,7 +89,8 @@ kotlin {`
`87`	`89`	`}`
`88`	`90`	`// use the android preset`
`89`	`91`	`android {`
`90`		`- publishLibraryVariants("release", "debug")`
	`92`	`+`
	`93`	`+ publishLibraryVariantsGroupedByFlavor = true`
`91`	`94`	`}`
`92`	`95`
`93`	`96`	`sourceSets {`