Merge pull request #7 from MarkYav/develop

Develop - v1.3.1

README.md

@@ -40,7 +40,7 @@ DrawBox(drawController = controller, modifier = Modifier.fillMaxSize())
 
 Using Gradle Kotlin DSL:
 ```kotlin
-implementation("io.github.markyav.drawbox:drawbox:1.3.0")
+implementation("io.github.markyav.drawbox:drawbox:1.3.1")
 ```
 
 ## Examples

build.gradle.kts

@@ -1,18 +1,11 @@
 group = Library.group
 version = Library.version
 
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-    }
-}
-
 plugins {
-    kotlin("multiplatform") apply false
-    kotlin("android") apply false
-    id("com.android.application") apply false
-    id("com.android.library") apply false
-    id("org.jetbrains.compose") apply false
+    //trick: for the same plugin versions in all sub-modules
+    alias(libs.plugins.androidApplication).apply(false)
+    alias(libs.plugins.androidLibrary).apply(false)
+    alias(libs.plugins.kotlinAndroid).apply(false)
+    alias(libs.plugins.kotlinMultiplatform).apply(false)
+    alias(libs.plugins.compose).apply(false)
 }

buildSrc/src/main/kotlin/Library.kt

@@ -5,7 +5,7 @@ object Library {
 
     val group = "io.github.markyav.drawbox"
     val artifact = "drawbox"
-    val version = "1.3.0"
+    val version = "1.3.1"
 
     object License {
         val name = "Apache-2.0"

drawbox/build.gradle.kts

@@ -1,41 +1,38 @@
 plugins {
-    kotlin("multiplatform")
-    id("org.jetbrains.compose")
-    id("com.android.library")
+    alias(libs.plugins.kotlinMultiplatform)
+    alias(libs.plugins.compose)
+    alias(libs.plugins.androidLibrary)
     id("convention-publication")
 }
 
 group = Library.group
 version = Library.version
 
 kotlin {
-    android {
+    androidTarget {
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
         publishLibraryVariants("release")
     }
     jvm("desktop") {
         jvmToolchain(11)
     }
     sourceSets {
-        val commonMain by getting {
-            dependencies {
-                api(compose.runtime)
-                api(compose.foundation)
-            }
+        commonMain.dependencies {
+            api(compose.runtime)
+            api(compose.foundation)
         }
-        val commonTest by getting
-        val androidMain by getting
-        val androidTest by getting
-        val desktopMain by getting
-        val desktopTest by getting
     }
 }
 
 android {
-    compileSdk = Android.compileSdk
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
+    namespace = "io.github.markyav.drawbox"
+    compileSdk = libs.versions.android.compileSdk.get().toInt()
     defaultConfig {
-        minSdk = Android.minSdk
-        targetSdk = Android.targetSdk
+        minSdk = libs.versions.android.minSdk.get().toInt()
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8

gradle.properties

@@ -1,6 +1,14 @@
+#Gradle
+org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.caching=true
+org.gradle.configuration-cache=true
+
+#Kotlin
 kotlin.code.style=official
-kotlin.native.enableDependencyPropagation=false
+kotlin.mpp.androidSourceSetLayoutVersion=2
+
+#Android
 android.useAndroidX=true
-kotlin.version=1.8.0
-agp.version=7.3.0
-compose.version=1.3.0
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false

gradle/libs.versions.toml

@@ -0,0 +1,27 @@
+[versions]
+
+android-targetSdk="34"
+android-compileSdk="34"
+android-minSdk="24"
+
+agp = "8.1.4"
+kotlin = "1.9.20"
+compose = "1.5.10"
+
+androidx-appcompat = "1.6.1"
+androidx-activityCompose = "1.8.0"
+androidx-coreKtx = "1.12.0"
+
+[libraries]
+
+androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
+androidx-activityCompose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
+androidx-coreKtx = { module = "androidx.core:core-ktx", version.ref = "androidx-coreKtx" }
+
+[plugins]
+
+compose = { id = "org.jetbrains.compose", version.ref = "compose" }
+androidApplication = { id = "com.android.application", version.ref = "agp" }
+androidLibrary = { id = "com.android.library", version.ref = "agp" }
+kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

sample/android/build.gradle.kts

@@ -1,32 +1,21 @@
 plugins {
-    id("org.jetbrains.compose")
-    id("com.android.application")
-    kotlin("android")
+    alias(libs.plugins.compose)
+    alias(libs.plugins.androidApplication)
+    alias(libs.plugins.kotlinAndroid)
 }
 
 group = Library.group
 version = Library.version
 
-repositories {
-    jcenter()
-}
-
-dependencies {
-    implementation(project(":drawbox"))
-    implementation("androidx.activity:activity-compose:1.5.0")
-    implementation(compose.material)
-    implementation("androidx.appcompat:appcompat:1.5.1")
-    implementation("androidx.core:core-ktx:1.9.0")
-}
-
 android {
-    compileSdk = Android.compileSdk
+    namespace = "io.github.markyav.drawbox.android"
+    compileSdk = libs.versions.android.compileSdk.get().toInt()
     defaultConfig {
-        applicationId = Android.applicationId
-        minSdk = Android.minSdk
-        targetSdk = Android.targetSdk
-        versionCode = Android.versionCode
-        versionName = Library.version
+        applicationId = "io.github.markyav.sample"
+        minSdk = libs.versions.android.minSdk.get().toInt()
+        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        versionCode = 1
+        versionName = "1.0"
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
@@ -37,4 +26,15 @@ android {
             isMinifyEnabled = false
         }
     }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    implementation(project(":drawbox"))
+    implementation(libs.androidx.activityCompose)
+    implementation(compose.material)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.coreKtx)
 }

sample/android/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.github.markyav.drawbox.android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
             android:allowBackup="false"
             android:supportsRtl="true"

settings.gradle.kts

@@ -5,13 +5,13 @@ pluginManagement {
         mavenCentral()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
+}
 
-    plugins {
-        kotlin("multiplatform").version(extra["kotlin.version"] as String)
-        kotlin("android").version(extra["kotlin.version"] as String)
-        id("com.android.application").version(extra["agp.version"] as String)
-        id("com.android.library").version(extra["agp.version"] as String)
-        id("org.jetbrains.compose").version(extra["compose.version"] as String)
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
 }