From dea531edf9b0793cc348d6ef7a0ded37a9658dff Mon Sep 17 00:00:00 2001 From: M0Coding Date: Wed, 23 Aug 2023 15:17:56 +0100 Subject: [PATCH 1/3] Update dependencies --- build.gradle.kts | 2 +- calf-file-picker/build.gradle.kts | 2 +- calf-io/build.gradle.kts | 2 +- calf-ui/build.gradle.kts | 2 +- gradle.properties | 6 +++--- sample/common/build.gradle.kts | 3 +++ settings.gradle.kts | 2 +- 7 files changed, 11 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4bdfe2c..b448a3b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("root.publication") +// id("root.publication") //trick: for the same plugin versions in all sub-modules alias(libs.plugins.androidApplication).apply(false) alias(libs.plugins.androidLibrary).apply(false) diff --git a/calf-file-picker/build.gradle.kts b/calf-file-picker/build.gradle.kts index a17b9ef..1a88ef0 100644 --- a/calf-file-picker/build.gradle.kts +++ b/calf-file-picker/build.gradle.kts @@ -2,7 +2,7 @@ plugins { alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.composeMultiplatform) alias(libs.plugins.androidLibrary) - id("module.publication") +// id("module.publication") } kotlin { diff --git a/calf-io/build.gradle.kts b/calf-io/build.gradle.kts index 789f344..81007d1 100644 --- a/calf-io/build.gradle.kts +++ b/calf-io/build.gradle.kts @@ -1,7 +1,7 @@ plugins { alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.androidLibrary) - id("module.publication") +// id("module.publication") } kotlin { diff --git a/calf-ui/build.gradle.kts b/calf-ui/build.gradle.kts index 40b6de8..2c76776 100644 --- a/calf-ui/build.gradle.kts +++ b/calf-ui/build.gradle.kts @@ -2,7 +2,7 @@ plugins { alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.composeMultiplatform) alias(libs.plugins.androidLibrary) - id("module.publication") +// id("module.publication") } kotlin { diff --git a/gradle.properties b/gradle.properties index 33c031f..89d6101 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ #Gradle org.gradle.jvmargs=-Xmx4048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx4048M" -org.gradle.caching=true -org.gradle.configuration-cache=true +#org.gradle.caching=true +#org.gradle.configuration-cache=true kotlin.code.style=official @@ -24,4 +24,4 @@ org.jetbrains.compose.experimental.uikit.enabled=true #kotlin.native.binary.memoryModel=experimental #kotlin.native.cocoapods.generate.wrapper=true #kotlin.native.useEmbeddableCompilerJar=true -#kotlin.native.cacheKind=none \ No newline at end of file +kotlin.native.cacheKind=none \ No newline at end of file diff --git a/sample/common/build.gradle.kts b/sample/common/build.gradle.kts index 4d4466e..0531400 100644 --- a/sample/common/build.gradle.kts +++ b/sample/common/build.gradle.kts @@ -34,6 +34,7 @@ kotlin { isStatic = true // IMPORTANT: Exporting calf-ui is required for some functionalities to work +// export(project(":calf-ui")) export("com.mohamedrejeb.calf:calf-ui:0.1.1") } } @@ -58,6 +59,8 @@ kotlin { // Calf api("com.mohamedrejeb.calf:calf-ui:0.1.1") implementation("com.mohamedrejeb.calf:calf-file-picker:0.1.1") +// api(project(":calf-ui")) +// implementation(project(":calf-file-picker")) implementation(project(":calf-navigation")) } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 9e6251e..7bda9c8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ pluginManagement { - includeBuild("convention-plugins") +// includeBuild("convention-plugins") repositories { google { mavenContent { From 308e1392e049382ead0b8ee4989aa4c95f3aa50c Mon Sep 17 00:00:00 2001 From: M0Coding Date: Wed, 23 Aug 2023 15:21:19 +0100 Subject: [PATCH 2/3] Update gradle.properties --- gradle.properties | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index 89d6101..64e38f3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ #Gradle org.gradle.jvmargs=-Xmx4048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx4048M" -#org.gradle.caching=true -#org.gradle.configuration-cache=true +org.gradle.caching=true +org.gradle.configuration-cache=true kotlin.code.style=official @@ -18,10 +18,4 @@ kotlin.js.compiler=ir org.jetbrains.compose.experimental.jscanvas.enabled=true #iOS -org.jetbrains.compose.experimental.uikit.enabled=true - -#Native -#kotlin.native.binary.memoryModel=experimental -#kotlin.native.cocoapods.generate.wrapper=true -#kotlin.native.useEmbeddableCompilerJar=true -kotlin.native.cacheKind=none \ No newline at end of file +org.jetbrains.compose.experimental.uikit.enabled=true \ No newline at end of file From d22db0b52d5e7b15b8b936d54ed9358645eebd3f Mon Sep 17 00:00:00 2001 From: M0Coding Date: Wed, 23 Aug 2023 15:27:59 +0100 Subject: [PATCH 3/3] Update gradle.properties --- gradle.properties | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 64e38f3..ece1d84 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ #Gradle org.gradle.jvmargs=-Xmx4048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx4048M" -org.gradle.caching=true -org.gradle.configuration-cache=true +#org.gradle.caching=true +#org.gradle.configuration-cache=true kotlin.code.style=official @@ -18,4 +18,7 @@ kotlin.js.compiler=ir org.jetbrains.compose.experimental.jscanvas.enabled=true #iOS -org.jetbrains.compose.experimental.uikit.enabled=true \ No newline at end of file +org.jetbrains.compose.experimental.uikit.enabled=true + +#Native +kotlin.native.cacheKind=none \ No newline at end of file