Change kotlin version

This commit is contained in:
2025-10-28 11:50:45 -03:00
parent f46e249e5d
commit ba4be7227a
3 changed files with 14 additions and 42 deletions

View File

@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
version = "1.7"> version = "1.3">
<BuildAction <BuildAction>
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries> <BuildActionEntries>
<BuildActionEntry <BuildActionEntry
buildForTesting = "YES" buildForRunning = "YES">
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "B4B7972B44BDD2578B417581" BlueprintIdentifier = "B4B7972B44BDD2578B417581"
@@ -21,25 +15,11 @@
</BuildActionEntry> </BuildActionEntry>
</BuildActionEntries> </BuildActionEntries>
</BuildAction> </BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction <LaunchAction
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO" buildConfiguration = "Release"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES"> allowLocationSimulation = "YES">
<BuildableProductRunnable <BuildableProductRunnable>
runnableDebuggingMode = "0">
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "B4B7972B44BDD2578B417581" BlueprintIdentifier = "B4B7972B44BDD2578B417581"
@@ -53,18 +33,4 @@
referenceType = "1"> referenceType = "1">
</LocationScenarioReference> </LocationScenarioReference>
</LaunchAction> </LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme> </Scheme>

View File

@@ -5,7 +5,7 @@ android-minSdk = "26"
android-targetSdk = "36" android-targetSdk = "36"
# Platform specific versions # Platform specific versions
agp = "8.13.0" agp = "8.13.0"
kotlin = "2.3.0-Beta1" kotlin = "2.2.21"
androidx-activity = "1.11.0" androidx-activity = "1.11.0"
androidx-core = "1.17.0" androidx-core = "1.17.0"
androidx-espresso = "3.7.0" androidx-espresso = "3.7.0"
@@ -99,6 +99,6 @@ kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
# Buildlogic defined plugins -> buildlogic/convention/build.gradle.kts # Buildlogic defined plugins -> echo/convention/build.gradle.kts
composeDevKit = { id = "dev.carlosmartino.plugins.composeMultiplatform", version = "unspecified" } composeDevKit = { id = "dev.carlosmartino.plugins.composeMultiplatform", version = "unspecified" }
kotlinDevKit = { id = "dev.carlosmartino.plugins.kotlinMultiplatform", version = "unspecified" } kotlinDevKit = { id = "dev.carlosmartino.plugins.kotlinMultiplatform", version = "unspecified" }

View File

@@ -1,4 +1,3 @@
rootProject.name = "Template"
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
pluginManagement { pluginManagement {
@@ -29,8 +28,15 @@ dependencyResolutionManagement {
} }
} }
rootProject.name = "Template"
// Template App module
include(":app:composeApp") include(":app:composeApp")
// Core modules
include(":bedrock:designsystem") include(":bedrock:designsystem")
include(":bedrock:common") include(":bedrock:common")
include(":bedrock:navigation") include(":bedrock:navigation")
// Feature modules
include(":features:common") include(":features:common")