Skip to content

Commit

Permalink
Merge pull request #1 from MohamedRejeb/0.1.x
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
MohamedRejeb authored Aug 23, 2023
2 parents 998f952 + d22db0b commit a4c955f
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion calf-file-picker/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.androidLibrary)
id("module.publication")
// id("module.publication")
}

kotlin {
Expand Down
2 changes: 1 addition & 1 deletion calf-io/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.androidLibrary)
id("module.publication")
// id("module.publication")
}

kotlin {
Expand Down
2 changes: 1 addition & 1 deletion calf-ui/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.androidLibrary)
id("module.publication")
// id("module.publication")
}

kotlin {
Expand Down
9 changes: 3 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -21,7 +21,4 @@ org.jetbrains.compose.experimental.jscanvas.enabled=true
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
kotlin.native.cacheKind=none
3 changes: 3 additions & 0 deletions sample/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
Expand All @@ -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"))
}
}
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pluginManagement {
includeBuild("convention-plugins")
// includeBuild("convention-plugins")
repositories {
google {
mavenContent {
Expand Down

0 comments on commit a4c955f

Please sign in to comment.