Commit e8982ddb authored by dong's avatar dong

升级到0.4.0-06

parent 78779e17
...@@ -23,7 +23,7 @@ kotlin.debug.generateLineNumbers=true ...@@ -23,7 +23,7 @@ kotlin.debug.generateLineNumbers=true
kotlin.debug.generateLocalVariables=true kotlin.debug.generateLocalVariables=true
ohosSkikoVersion=0.9.22.2-0.4.0-08 ohosSkikoVersion=0.9.22.2-0.4.0-09
# 统一渲染(fusion-renderer);自渲染用 skia # 统一渲染(fusion-renderer);自渲染用 skia
rendererBackend=fusion-renderer rendererBackend=fusion-renderer
#rendererBackend=skia #rendererBackend=skia
......
...@@ -16,27 +16,21 @@ androidx-lifecycle = "2.9.6" ...@@ -16,27 +16,21 @@ androidx-lifecycle = "2.9.6"
androidx-material = "1.12.0" androidx-material = "1.12.0"
androidx-testExt = "1.3.0" androidx-testExt = "1.3.0"
junit = "4.13.2" junit = "4.13.2"
## Compose
#compose = "1.9.4"
#compose-material3 = "1.4.0"
#composeMultiplatform = "1.9.2-0.4.0-16"
#
## Kotlin & testing
#kotlin = "2.2.21-0.4.0-04"
#kotlinx-coroutines = "1.10.2-0.4.0-03"
#atomicFu = "0.31.0-0.4.0-03"
# Compose # Compose
compose = "1.9.4" compose = "1.9.4"
compose-material3 = "1.4.0" compose-material3 = "1.4.0"
composeMultiplatform = "1.9.2-0.4.0-20" composeMultiplatform = "1.9.2-0.4.0-21"
# Kotlin & testing # Kotlin & testing
kotlin = "2.2.21-0.4.0-05" kotlin = "2.2.21-0.4.0-06"
kotlinx-coroutines = "1.10.2-0.4.0-04" kotlinx-coroutines = "1.10.2-0.4.0-05"
atomicFu = "0.31.0-0.4.0-04" atomicFu = "0.31.0-0.4.0-04"
[libraries] [libraries]
# ----- Testing ----- # ----- Testing -----
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
......
...@@ -31,11 +31,11 @@ ...@@ -31,11 +31,11 @@
"material": { "material": {
"certpath": "/Users/dongsq/.ohos/config/default_harmonyApp_7ofaDImBKbWsZVhjGAeOTyhToW4KCk7GMqQbmMIzdE4=.cer", "certpath": "/Users/dongsq/.ohos/config/default_harmonyApp_7ofaDImBKbWsZVhjGAeOTyhToW4KCk7GMqQbmMIzdE4=.cer",
"keyAlias": "debugKey", "keyAlias": "debugKey",
"keyPassword": "0000001AF71455007EF4463C0473003A3AA2DBB972585F6893EBC15A22E0131BFE58DA3D9FC29B93F29E", "keyPassword": "0000001A99FB765C15C3BE861F29354D47721EC3CC8119E06D14B347A1698FA5824467C934C39C26F6AE",
"profile": "/Users/dongsq/.ohos/config/default_harmonyApp_7ofaDImBKbWsZVhjGAeOTyhToW4KCk7GMqQbmMIzdE4=.p7b", "profile": "/Users/dongsq/.ohos/config/default_harmonyApp_7ofaDImBKbWsZVhjGAeOTyhToW4KCk7GMqQbmMIzdE4=.p7b",
"signAlg": "SHA256withECDSA", "signAlg": "SHA256withECDSA",
"storeFile": "/Users/dongsq/.ohos/config/default_harmonyApp_7ofaDImBKbWsZVhjGAeOTyhToW4KCk7GMqQbmMIzdE4=.p12", "storeFile": "/Users/dongsq/.ohos/config/default_harmonyApp_7ofaDImBKbWsZVhjGAeOTyhToW4KCk7GMqQbmMIzdE4=.p12",
"storePassword": "0000001A9C1D9341B45DA97284EE893433FFB95FA3DBC58752C06E1083E641FD5FCCC7AE6C99B74762D6" "storePassword": "0000001A68AAC83AC7EB9C5CB5CB64DF590495E8CE0AA6FAC7A658175D488C9B79EF97E0DDE3B5526219"
} }
} }
] ]
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"externalNativeOptions": { "externalNativeOptions": {
"path": "./src/main/cpp/CMakeLists.txt", "path": "./src/main/cpp/CMakeLists.txt",
//"arguments": "-DOHOS_ENABLE_HWASAN=ON", //"arguments": "-DOHOS_ENABLE_HWASAN=ON",
"arguments": "-DOHOS_ENABLE_ASAN=ON", // "arguments": "-DOHOS_ENABLE_ASAN=ON",
"cppFlags": "", "cppFlags": "",
"abiFilters": ["arm64-v8a","x86_64"] "abiFilters": ["arm64-v8a","x86_64"]
}, },
......
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
"ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
"specifiers": { "specifiers": {
"@cpf-kmp-cmp/compose@libs/compose.har": "@cpf-kmp-cmp/compose@libs/compose.har", "@cpf-kmp-cmp/compose@libs/compose.har": "@cpf-kmp-cmp/compose@libs/compose.har",
"libcompose_arkui_utils.so@../oh_modules/.ohpm/@cpf-kmp-cmp+compose@7hkvj9+fmcbz689mk4jwrssdifbiovrmuxqovzhm5n0=/oh_modules/@cpf-kmp-cmp/compose/src/main/cpp/types/libcompose_arkui_utils": "libcompose_arkui_utils.so@../oh_modules/.ohpm/@cpf-kmp-cmp+compose@7hkvj9+fmcbz689mk4jwrssdifbiovrmuxqovzhm5n0=/oh_modules/@cpf-kmp-cmp/compose/src/main/cpp/types/libcompose_arkui_utils", "libcompose_arkui_utils.so@../oh_modules/.ohpm/@cpf-kmp-cmp+compose@ylv0vqyajw2tpyq0yjrkjqk3kb8wqxt0yiib9f7hd2y=/oh_modules/@cpf-kmp-cmp/compose/src/main/cpp/types/libcompose_arkui_utils": "libcompose_arkui_utils.so@../oh_modules/.ohpm/@cpf-kmp-cmp+compose@ylv0vqyajw2tpyq0yjrkjqk3kb8wqxt0yiib9f7hd2y=/oh_modules/@cpf-kmp-cmp/compose/src/main/cpp/types/libcompose_arkui_utils",
"libentry.so@src/main/cpp/types/libentry": "libentry.so@src/main/cpp/types/libentry", "libentry.so@src/main/cpp/types/libentry": "libentry.so@src/main/cpp/types/libentry",
"libskikobridge.so@../oh_modules/.ohpm/@cpf-kmp-cmp+compose@7hkvj9+fmcbz689mk4jwrssdifbiovrmuxqovzhm5n0=/oh_modules/@cpf-kmp-cmp/compose/src/main/cpp/types/libskikobridge": "libskikobridge.so@../oh_modules/.ohpm/@cpf-kmp-cmp+compose@7hkvj9+fmcbz689mk4jwrssdifbiovrmuxqovzhm5n0=/oh_modules/@cpf-kmp-cmp/compose/src/main/cpp/types/libskikobridge" "libskikobridge.so@../oh_modules/.ohpm/@cpf-kmp-cmp+compose@ylv0vqyajw2tpyq0yjrkjqk3kb8wqxt0yiib9f7hd2y=/oh_modules/@cpf-kmp-cmp/compose/src/main/cpp/types/libskikobridge": "libskikobridge.so@../oh_modules/.ohpm/@cpf-kmp-cmp+compose@ylv0vqyajw2tpyq0yjrkjqk3kb8wqxt0yiib9f7hd2y=/oh_modules/@cpf-kmp-cmp/compose/src/main/cpp/types/libskikobridge"
}, },
"packages": { "packages": {
"@cpf-kmp-cmp/compose@libs/compose.har": { "@cpf-kmp-cmp/compose@libs/compose.har": {
"name": "@cpf-kmp-cmp/compose", "name": "@cpf-kmp-cmp/compose",
"version": "1.9.2-0.4.0-16", "version": "1.9.2-0.4.0-21",
"resolved": "libs/compose.har", "resolved": "libs/compose.har",
"registryType": "local", "registryType": "local",
"dependencies": { "dependencies": {
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
"libskikobridge.so": "file:./src/main/cpp/types/libskikobridge" "libskikobridge.so": "file:./src/main/cpp/types/libskikobridge"
} }
}, },
"libcompose_arkui_utils.so@../oh_modules/.ohpm/@cpf-kmp-cmp+compose@7hkvj9+fmcbz689mk4jwrssdifbiovrmuxqovzhm5n0=/oh_modules/@cpf-kmp-cmp/compose/src/main/cpp/types/libcompose_arkui_utils": { "libcompose_arkui_utils.so@../oh_modules/.ohpm/@cpf-kmp-cmp+compose@ylv0vqyajw2tpyq0yjrkjqk3kb8wqxt0yiib9f7hd2y=/oh_modules/@cpf-kmp-cmp/compose/src/main/cpp/types/libcompose_arkui_utils": {
"name": "libcompose_arkui_utils.so", "name": "libcompose_arkui_utils.so",
"version": "1.0.0", "version": "1.0.0",
"resolved": "../oh_modules/.ohpm/@cpf-kmp-cmp+compose@7hkvj9+fmcbz689mk4jwrssdifbiovrmuxqovzhm5n0=/oh_modules/@cpf-kmp-cmp/compose/src/main/cpp/types/libcompose_arkui_utils", "resolved": "../oh_modules/.ohpm/@cpf-kmp-cmp+compose@ylv0vqyajw2tpyq0yjrkjqk3kb8wqxt0yiib9f7hd2y=/oh_modules/@cpf-kmp-cmp/compose/src/main/cpp/types/libcompose_arkui_utils",
"registryType": "local" "registryType": "local"
}, },
"libentry.so@src/main/cpp/types/libentry": { "libentry.so@src/main/cpp/types/libentry": {
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
"resolved": "src/main/cpp/types/libentry", "resolved": "src/main/cpp/types/libentry",
"registryType": "local" "registryType": "local"
}, },
"libskikobridge.so@../oh_modules/.ohpm/@cpf-kmp-cmp+compose@7hkvj9+fmcbz689mk4jwrssdifbiovrmuxqovzhm5n0=/oh_modules/@cpf-kmp-cmp/compose/src/main/cpp/types/libskikobridge": { "libskikobridge.so@../oh_modules/.ohpm/@cpf-kmp-cmp+compose@ylv0vqyajw2tpyq0yjrkjqk3kb8wqxt0yiib9f7hd2y=/oh_modules/@cpf-kmp-cmp/compose/src/main/cpp/types/libskikobridge": {
"name": "libskikobridge.so", "name": "libskikobridge.so",
"version": "0.0.0", "version": "0.0.0",
"resolved": "../oh_modules/.ohpm/@cpf-kmp-cmp+compose@7hkvj9+fmcbz689mk4jwrssdifbiovrmuxqovzhm5n0=/oh_modules/@cpf-kmp-cmp/compose/src/main/cpp/types/libskikobridge", "resolved": "../oh_modules/.ohpm/@cpf-kmp-cmp+compose@ylv0vqyajw2tpyq0yjrkjqk3kb8wqxt0yiib9f7hd2y=/oh_modules/@cpf-kmp-cmp/compose/src/main/cpp/types/libskikobridge",
"registryType": "local" "registryType": "local"
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment