Skip to content

Commit

Permalink
feat: updated compose version and added decompose
Browse files Browse the repository at this point in the history
  • Loading branch information
JamshedAlamQaderi committed Aug 11, 2023
1 parent 4a05899 commit 831ff48
Show file tree
Hide file tree
Showing 47 changed files with 354 additions and 537 deletions.
4 changes: 3 additions & 1 deletion .idea/artifacts/web_js.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion .idea/artifacts/web_router_js.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 13 additions & 26 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,35 +1,22 @@
group = "com.jamshedalamqaderi.portfolio"
version = "1.0-SNAPSHOT"
plugins {
kotlin("multiplatform") apply false
kotlin("plugin.serialization") apply false
id("org.jetbrains.compose") apply false
id("org.jlleitschuh.gradle.ktlint") apply false
id("com.codingfeline.buildkonfig") apply false
}

allprojects {
apply(plugin = "org.jlleitschuh.gradle.ktlint")

repositories {
google()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental")
}

configurations.all {
val conf = this
// Currently it's necessary to make the android build work properly
conf.resolutionStrategy.eachDependency {
val isWasm = conf.name.contains("wasm", true)
val isJs = conf.name.contains("js", true)
val isComposeGroup = requested.module.group.startsWith("org.jetbrains.compose")
val isComposeCompiler = requested.module.group.startsWith("org.jetbrains.compose.compiler")
if (isComposeGroup && !isComposeCompiler && !isWasm && !isJs) {
val composeVersion = project.property("compose.version") as String
useVersion(composeVersion)
}
if (requested.module.name.startsWith("kotlin-stdlib")) {
val kotlinVersion = project.property("kotlin.version") as String
useVersion(kotlinVersion)
}
}
}
}

plugins {
kotlin("multiplatform") apply false
id("org.jetbrains.compose") apply false
}
rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().download =
false
}
15 changes: 12 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@ org.gradle.jvmargs=-Xmx3g
kotlin.code.style=official
org.jetbrains.compose.experimental.jscanvas.enabled=true
kotlin.js.ir.output.granularity=whole-program
compose.wasm.version=1.4.0-dev-wasm09
compose.version=1.4.0
kotlin.version=1.9.0
kotlin.incremental.js.ir=false


compose.version=1.5.0-beta01
kotlin.version=1.9.0
buildKonfigVersion=0.13.3

ktlintVersion=11.0.0
decomposeVersion=2.0.1-compose-experimental
koinVersion=3.2.2
koinComposeVersion=1.0.4
mokoMvvmVersion=0.16.1
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Jul 24 11:46:47 BDT 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
15 changes: 11 additions & 4 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,20 @@ pluginManagement {
gradlePluginPortal()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental")
}

plugins {
kotlin("multiplatform").version(extra["kotlin.version"] as String)
id("org.jetbrains.compose").version(extra["compose.wasm.version"] as String)
val kotlinVersion = extra["kotlin.version"] as String
val composeVersion = extra["compose.version"] as String
val ktlintVersion = extra["ktlintVersion"] as String
val buildKonfigVersion = extra["buildKonfigVersion"] as String

kotlin("multiplatform").version(kotlinVersion)
kotlin("plugin.serialization").version(kotlinVersion)
id("org.jetbrains.compose").version(composeVersion)
id("org.jlleitschuh.gradle.ktlint").version(ktlintVersion)
id("com.codingfeline.buildkonfig").version(buildKonfigVersion)
}
}
rootProject.name = "portfolio"
include("web-router",":web")
include(":web")
9 changes: 9 additions & 0 deletions vercel.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"routes": [
{
"src": "/[^.]+",
"dest": "/",
"status": 200
}
]
}
25 changes: 0 additions & 25 deletions web-router/build.gradle.kts

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 831ff48

Please sign in to comment.