Skip to content

Commit cb9d06c

Browse files
rviannaoliveirarviannaoliveira
committed
[issue-59] - works xml
1 parent 06716ba commit cb9d06c

10 files changed

Lines changed: 79 additions & 25 deletions

File tree

‎android_kmp/KMP-Sample/composeApp/src/commonMain/kotlin/org/example/project/presentation/compose/InitialScreen.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import androidx.compose.runtime.LaunchedEffect
55
import androidx.compose.runtime.collectAsState
66
import androidx.compose.runtime.getValue
77
import androidx.compose.runtime.remember
8-
import androidx.lifecycle.compose.collectAsStateWithLifecycle
98
import org.example.project.presentation.compose.customview.MySampleButtonComposeBuilder
109
import com.github.codandotv.craftd.compose.builder.CraftDBuilderManager
1110
import com.github.codandotv.craftd.compose.ui.CraftDynamic

‎android_kmp/KMP-Sample/gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ androidx-espresso = "3.7.0"
1010
androidx-lifecycle = "2.9.4"
1111
androidx-testExt = "1.3.0"
1212
composeMultiplatform = "1.9.0"
13-
craftdCompose = "1.0.4"
13+
craftdCompose = "1.1.0"
1414
junit = "4.13.2"
1515
kotlin = "2.2.21"
1616
kotlinxCoroutinesCore = "1.10.2"

‎android_kmp/app-sample-android/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ dependencies {
1616
implementation(libs.kotlinx.serialization.json)
1717

1818
implementation(projects.craftdCore)
19-
implementation(projects.craftdXml)
19+
// implementation(projects.craftdXml)
2020
implementation(projects.craftdCompose)
2121

2222
implementation(libs.androidx.core)
2323
implementation(libs.androidx.appcompat)
2424
implementation(libs.google.material)
2525
implementation(libs.kotlinx.collections.immutable)
2626

27-
// implementation("io.github.codandotv:craftd-xml:0.0.1") // revisar se é necessário junto com `projects.craftdXml`
27+
implementation("io.github.codandotv:craftd-xml:1.1.0") // revisar se é necessário junto com `projects.craftdXml`
2828

2929
implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version")
3030
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version")

‎android_kmp/build-logic/src/main/java/com.codandotv.publish-android.gradle.kts‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
import com.vanniktech.maven.publish.AndroidMultiVariantLibrary
2+
import com.vanniktech.maven.publish.SonatypeHost
3+
4+
plugins{
5+
id("com.vanniktech.maven.publish.base")
6+
}
7+
8+
mavenPublishing {
9+
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
10+
signAllPublications()
11+
12+
configure(
13+
AndroidMultiVariantLibrary(
14+
sourcesJar = true,
15+
publishJavadocJar = true,
16+
)
17+
)
18+
19+
coordinates(
20+
project.property("GROUP_ID") as String,
21+
project.property("ARTIFACT_ID") as String,
22+
project.property("VERSION") as String
23+
)
24+
25+
pom {
26+
name.set(project.property("ARTIFACT_ID") as String)
27+
description.set(project.property("ARTIFACT_ID") as String)
28+
inceptionYear.set("2024")
29+
url.set(project.property("POM_URL") as String)
30+
31+
licenses {
32+
license {
33+
name.set(project.property("POM_LICENSE_NAME") as String)
34+
url.set(project.property("POM_LICENSE_URL") as String)
35+
}
36+
}
37+
scm {
38+
connection.set("scm:git@github.com:CodandoTV/CraftD.git")
39+
url.set("https://github.com/CodandoTV/CraftD.git")
40+
}
41+
developers {
42+
developer {
43+
id.set(project.property("POM_DEVELOPER_ID") as String)
44+
name.set(project.property("POM_DEVELOPER_NAME") as String)
45+
email.set(project.property("POM_DEVELOPER_EMAIL") as String)
46+
}
47+
}
48+
}
49+
}

‎android_kmp/craftd-core/src/commonMain/kotlin/com/github/codandotv/craftd/androidcore/presentation/CraftDComponentKey.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ enum class CraftDComponentKey(val key: String) {
77
CHECK_BOX_COMPONENT("${CRAFT_D}CheckBox"),
88
}
99

10-
internal const val CRAFT_D = "CraftD"
10+
internal const val CRAFT_D = "CraftD"

‎android_kmp/craftd-xml/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ android{
66

77
plugins {
88
id("com.codandotv.android-library")
9-
id("com.codandotv.publish")
9+
id("com.codandotv.publish-android")
1010
}
1111

1212
dependencies {

‎flutter/sample/macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXAggregateTarget section */
@@ -182,7 +182,7 @@
182182
isa = PBXProject;
183183
attributes = {
184184
LastSwiftUpdateCheck = 0920;
185-
LastUpgradeCheck = 1300;
185+
LastUpgradeCheck = 1510;
186186
ORGANIZATIONNAME = "";
187187
TargetAttributes = {
188188
33CC10EC2044A3C60003C045 = {
@@ -235,6 +235,7 @@
235235
/* Begin PBXShellScriptBuildPhase section */
236236
3399D490228B24CF009A79C7 /* ShellScript */ = {
237237
isa = PBXShellScriptBuildPhase;
238+
alwaysOutOfDate = 1;
238239
buildActionMask = 2147483647;
239240
files = (
240241
);
@@ -344,7 +345,7 @@
344345
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
345346
GCC_WARN_UNUSED_FUNCTION = YES;
346347
GCC_WARN_UNUSED_VARIABLE = YES;
347-
MACOSX_DEPLOYMENT_TARGET = 10.11;
348+
MACOSX_DEPLOYMENT_TARGET = 10.15;
348349
MTL_ENABLE_DEBUG_INFO = NO;
349350
SDKROOT = macosx;
350351
SWIFT_COMPILATION_MODE = wholemodule;
@@ -423,7 +424,7 @@
423424
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
424425
GCC_WARN_UNUSED_FUNCTION = YES;
425426
GCC_WARN_UNUSED_VARIABLE = YES;
426-
MACOSX_DEPLOYMENT_TARGET = 10.11;
427+
MACOSX_DEPLOYMENT_TARGET = 10.15;
427428
MTL_ENABLE_DEBUG_INFO = YES;
428429
ONLY_ACTIVE_ARCH = YES;
429430
SDKROOT = macosx;
@@ -470,7 +471,7 @@
470471
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
471472
GCC_WARN_UNUSED_FUNCTION = YES;
472473
GCC_WARN_UNUSED_VARIABLE = YES;
473-
MACOSX_DEPLOYMENT_TARGET = 10.11;
474+
MACOSX_DEPLOYMENT_TARGET = 10.15;
474475
MTL_ENABLE_DEBUG_INFO = NO;
475476
SDKROOT = macosx;
476477
SWIFT_COMPILATION_MODE = wholemodule;

‎flutter/sample/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -48,6 +48,7 @@
4848
ignoresPersistentStateOnLaunch = "NO"
4949
debugDocumentVersioning = "YES"
5050
debugServiceExtension = "internal"
51+
enableGPUValidationMode = "1"
5152
allowLocationSimulation = "YES">
5253
<BuildableProductRunnable
5354
runnableDebuggingMode = "0">

‎flutter/sample/macos/Runner/AppDelegate.swift‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
import Cocoa
22
import FlutterMacOS
33

4-
@NSApplicationMain
4+
@main
55
class AppDelegate: FlutterAppDelegate {
66
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
77
return true
88
}
9+
10+
override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
11+
return true
12+
}
913
}

‎flutter/sample/pubspec.lock‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ packages:
159159
path: "../craftd_widget"
160160
relative: true
161161
source: path
162-
version: "1.0.0"
162+
version: "1.0.2"
163163
crypto:
164164
dependency: transitive
165165
description:
@@ -318,26 +318,26 @@ packages:
318318
dependency: transitive
319319
description:
320320
name: leak_tracker
321-
sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
321+
sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
322322
url: "https://pub.dev"
323323
source: hosted
324-
version: "10.0.9"
324+
version: "11.0.2"
325325
leak_tracker_flutter_testing:
326326
dependency: transitive
327327
description:
328328
name: leak_tracker_flutter_testing
329-
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
329+
sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
330330
url: "https://pub.dev"
331331
source: hosted
332-
version: "3.0.9"
332+
version: "3.0.10"
333333
leak_tracker_testing:
334334
dependency: transitive
335335
description:
336336
name: leak_tracker_testing
337-
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
337+
sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
338338
url: "https://pub.dev"
339339
source: hosted
340-
version: "3.0.1"
340+
version: "3.0.2"
341341
lints:
342342
dependency: transitive
343343
description:
@@ -547,10 +547,10 @@ packages:
547547
dependency: transitive
548548
description:
549549
name: test_api
550-
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
550+
sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
551551
url: "https://pub.dev"
552552
source: hosted
553-
version: "0.7.4"
553+
version: "0.7.6"
554554
timing:
555555
dependency: transitive
556556
description:
@@ -571,10 +571,10 @@ packages:
571571
dependency: transitive
572572
description:
573573
name: vector_math
574-
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
574+
sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
575575
url: "https://pub.dev"
576576
source: hosted
577-
version: "2.1.4"
577+
version: "2.2.0"
578578
vm_service:
579579
dependency: transitive
580580
description:
@@ -608,5 +608,5 @@ packages:
608608
source: hosted
609609
version: "3.1.2"
610610
sdks:
611-
dart: ">=3.7.0-0 <4.0.0"
611+
dart: ">=3.8.0-0 <4.0.0"
612612
flutter: ">=3.18.0-18.0.pre.54"

0 commit comments

Comments
 (0)