update to latest tauri

feat/camera
Lucas Nogueira 2 years ago
parent 0782a6eb48
commit adda363798
No known key found for this signature in database
GPG Key ID: FFEA6C72E73482F1

28
Cargo.lock generated

@ -4246,9 +4246,9 @@ dependencies = [
[[package]]
name = "tauri"
version = "2.0.0-alpha.4"
version = "2.0.0-alpha.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e113835bb47f8cab6d1fb3b1a2e3d96ddd64730248638a5ab3f46a598c02a81c"
checksum = "e87f379b9abbfb5e5d79682f910eebc30ca82aedd4f23d8ea8f18f9b39859542"
dependencies = [
"anyhow",
"bytes 1.4.0",
@ -4298,9 +4298,9 @@ dependencies = [
[[package]]
name = "tauri-build"
version = "2.0.0-alpha.2"
version = "2.0.0-alpha.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "383f94e1b46fb4e249e4eafbd0589ffbe02b241b49dadebd47640598a17e584e"
checksum = "ae08b0f8601a4871495373419208aebb881d03065ec1b78d634dd0f1950c9ca3"
dependencies = [
"anyhow",
"cargo_toml",
@ -4318,9 +4318,9 @@ dependencies = [
[[package]]
name = "tauri-codegen"
version = "2.0.0-alpha.2"
version = "2.0.0-alpha.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5914e68c4ba4d9b761373dcce86f6721de78c2ffd84f376b1e0fee9321c0fc7e"
checksum = "c8975226524feaccd0676c24b53b1058f5242f3ba17d9efc802ceb23f6d8c48e"
dependencies = [
"base64 0.21.0",
"brotli",
@ -4344,9 +4344,9 @@ dependencies = [
[[package]]
name = "tauri-macros"
version = "2.0.0-alpha.2"
version = "2.0.0-alpha.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adedb0845af0d5840b54410f83135bb285ab372956678e0b12046a87999486fb"
checksum = "22d81e435c16c49f6f8c0ecc1e64b39b870a0cf526fd66e183dda5c147cd47c3"
dependencies = [
"heck",
"proc-macro2",
@ -4577,9 +4577,9 @@ dependencies = [
[[package]]
name = "tauri-runtime"
version = "0.13.0-alpha.2"
version = "0.13.0-alpha.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11c9ce3ab30f6a95a09131510a624d5de24455ba9e8fcae6a6fe9e0922f833c8"
checksum = "d3fd1f35ab7f14f17b357e9bce2e227e5f0ba866a9d9b9b2329614083773c2d3"
dependencies = [
"gtk",
"http",
@ -4599,9 +4599,9 @@ dependencies = [
[[package]]
name = "tauri-runtime-wry"
version = "0.13.0-alpha.2"
version = "0.13.0-alpha.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e176af0987e4ced285bec0faf56eed0f13a1b3851d9176fa6758181f867cdc3"
checksum = "77145b9aa717f6435848f7fe93b68de18d66ef571a9d44aa08875957046e11fc"
dependencies = [
"cocoa",
"gtk",
@ -4620,9 +4620,9 @@ dependencies = [
[[package]]
name = "tauri-utils"
version = "2.0.0-alpha.2"
version = "2.0.0-alpha.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a488bb0c60e2ce9efbe8283a11299675e01f55caf12304889f8639b3c35713c"
checksum = "a9e8414397543d0d1f2f462094f8b54cc5d522b048c3bd323e8eea274d0271e8"
dependencies = [
"brotli",
"ctor",

@ -5,8 +5,8 @@ resolver = "2"
[workspace.dependencies]
serde = { version = "1", features = ["derive"] }
log = "0.4"
tauri = "2.0.0-alpha.4"
tauri-build = "2.0.0-alpha.2"
tauri = "2.0.0-alpha.6"
tauri-build = "2.0.0-alpha.3"
serde_json = "1"
thiserror = "1"

@ -1,2 +1,2 @@
/build
/tauri-api
/.tauri

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="app.tauri.camera">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<queries>
<intent>
<action android:name="android.media.action.IMAGE_CAPTURE" />

@ -15,7 +15,7 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "^1.0.1",
"@tauri-apps/cli": "^2.0.0-alpha.0",
"@tauri-apps/cli": "^2.0.0-alpha.6",
"internal-ip": "^7.0.0",
"svelte": "^3.49.0",
"vite": "^3.0.2"

File diff suppressed because it is too large Load Diff

@ -19,7 +19,7 @@ tauri-build = { git = "https://github.com/tauri-apps/tauri", branch = "next", fe
[dependencies]
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
tauri = { git = "https://github.com/tauri-apps/tauri", branch = "next", features = ["api-all"] }
tauri = { version = "2.0.0-alpha.6", features = ["api-all"] }
tauri-plugin-camera = { path = "../../../" }
[features]

@ -9,10 +9,11 @@
/.idea/assetWizardSettings.xml
.DS_Store
build
/buildSrc/src/main/java/app/tauri/app/kotlin/BuildTask.kt
/buildSrc/src/main/java/app/tauri/app/kotlin/RustPlugin.kt
/captures
.externalNativeBuild
.cxx
local.properties
/tauri-plugins
/tauri-api
/.tauri

@ -1,6 +1,10 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-keep class app.tauri.app.TauriActivity {
-keep class app.tauri.app.* {
native <methods>;
}
-keepclassmembers class app.tauri.app.TauriActivity {
getAppClass(...);
getVersion();
}
@ -22,3 +26,5 @@
-keep class app.tauri.app.MainActivity {
public getPluginManager();
}
-keep class androidx.appcompat.app.AppCompatActivity { }

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"

@ -1 +0,0 @@
/home/lucas/projects/tauri/plugins-workspace/plugins/camera/examples/tauri-app/src-tauri/target/aarch64-linux-android/debug/libapp.so

@ -1 +0,0 @@
/home/lucas/projects/tauri/plugins-workspace/plugins/camera/examples/tauri-app/src-tauri/target/i686-linux-android/debug/libapp.so

@ -1,4 +1,4 @@
<resources>
<string name="app_name">Tauri Camera</string>
<string name="main_activity_title">Camera</string>
<string name="app_name">app</string>
<string name="main_activity_title">app</string>
</resources>

@ -3,6 +3,5 @@
val implementation by configurations
dependencies {
implementation(project(":tauri-plugin-camera"))
}

@ -1,6 +1,7 @@
package app.tauri
import java.io.File
import org.apache.tools.ant.taskdefs.condition.Os
import org.gradle.api.DefaultTask
import org.gradle.api.GradleException
import org.gradle.api.logging.LogLevel
@ -21,13 +22,28 @@ open class BuildTask : DefaultTask() {
@TaskAction
fun build() {
val executable = """yarn""";
try {
runTauriCli(executable)
} catch (e: Exception){
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
runTauriCli("$executable.cmd")
} else {
throw e;
}
}
}
fun runTauriCli(executable: String) {
val rootDirRel = rootDirRel ?: throw GradleException("rootDirRel cannot be null")
val target = target ?: throw GradleException("target cannot be null")
val release = release ?: throw GradleException("release cannot be null")
val args = listOf("tauri", "android", "android-studio-script");
project.exec {
workingDir(File(project.projectDir, rootDirRel.path))
executable("""cargo""")
args(listOf("tauri", "android", "android-studio-script"))
executable(executable)
args(args)
if (project.logger.isEnabled(LogLevel.DEBUG)) {
args("-vv")
} else if (project.logger.isEnabled(LogLevel.INFO)) {
@ -39,5 +55,4 @@ open class BuildTask : DefaultTask() {
args(listOf("--target", target))
}.assertNormalExitValue()
}
}
}

@ -1,6 +1,6 @@
include ':app'
include ':tauri-android'
project(':tauri-android').projectDir = new File('./tauri-api')
project(':tauri-android').projectDir = new File('./.tauri/tauri-api')
apply from: 'tauri.settings.gradle'

@ -1,3 +1 @@
// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
include ':tauri-plugin-camera'
project(':tauri-plugin-camera').projectDir = new File('./tauri-plugins/tauri-plugin-camera')
// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.

@ -34,65 +34,65 @@
resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-2.0.0-alpha.0.tgz#901abbaf3b9515ba0437716ac0383de549e4e3bc"
integrity sha512-PQdy1Ao6JwKwW2/C11nP+IqnrWHB7+UgbM71zbzA1W3+1yyd9Zg+K7rzZ7f3yhvD7kdxmXUN3KgSfGeiDFzZ2A==
"@tauri-apps/cli-darwin-arm64@2.0.0-alpha.2":
version "2.0.0-alpha.2"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.0.0-alpha.2.tgz#0af2c077b80778ac4d138a0d42a5f406fcc205ee"
integrity sha512-Wu5QdZUgh0DEE0b3EKdJRkZzFoVngezxgvncQlMdXNaiKjdT767K2fB0XvQps+ycbtVLbUlG15jAwPZbWqRYGw==
"@tauri-apps/cli-darwin-x64@2.0.0-alpha.2":
version "2.0.0-alpha.2"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.0.0-alpha.2.tgz#e82f01e53dabb23c700f82e904e36ac0ee635f38"
integrity sha512-e5VLsT/exSW1swUWkhCEAQ/fM8mZaUMoGeyESYtO7VfTNVglS0j+VfQ9a8taRxtOkajDZmqMDvmii4tA5I1Bbw==
"@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-alpha.2":
version "2.0.0-alpha.2"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.0.0-alpha.2.tgz#866000663c66abd8ae88682c0f6cf03734ca7c6e"
integrity sha512-+/emaFpDPuqnTIyh+WcDqCbzc/SoREFfLDyumqdnFjRU1Uvc2Z9Eo/sMVnfuUw5vDMc2EPzYtT3uiZGez65ZTA==
"@tauri-apps/cli-linux-arm64-gnu@2.0.0-alpha.2":
version "2.0.0-alpha.2"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.0.0-alpha.2.tgz#157a893fa2d36e56ec16de213ed2d0a9b209833c"
integrity sha512-UHAyqt8fFbp9MEbUHSiEKjJC98w/Dta3r9auE70K+/uNpt9pnP/lGturDWWAJagRIFwYKPyqSEqL5qFcKadYqw==
"@tauri-apps/cli-linux-arm64-musl@2.0.0-alpha.2":
version "2.0.0-alpha.2"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.0.0-alpha.2.tgz#452fb06b5c563500206ba4a8cd5d979b1a3c71de"
integrity sha512-3euwm11RWvmTX+ISR/Y+N0TaWTJCRIj1pDgB+r2ZptRKlVTMNTJZDTXQlyJKcWEpi1azlbdxAzRvhN8NrgDmyA==
"@tauri-apps/cli-linux-x64-gnu@2.0.0-alpha.2":
version "2.0.0-alpha.2"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.0.0-alpha.2.tgz#155c7ab8c4c2b319bca38580e77bc6f6ffc2d664"
integrity sha512-ijJ8Wij5mVd9p6lXQ+pXoFlx3Iv1JS1KQTeySICds43xzE8esGp5+HXRXDwWqQLdVmtI77P5VRIe2ssXiaeDUg==
"@tauri-apps/cli-linux-x64-musl@2.0.0-alpha.2":
version "2.0.0-alpha.2"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.0.0-alpha.2.tgz#9965b076965bc8faf5623c9f67724ebeb9a197e7"
integrity sha512-sg8OTQfG/zJ4+6MA/+hk08hVb57iJn5VZDzBb3o6IpJ0cwtM8YDNv5C+6HWttBuxsn4oEoYxGml/FvowMfsOCg==
"@tauri-apps/cli-win32-ia32-msvc@2.0.0-alpha.2":
version "2.0.0-alpha.2"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.0.0-alpha.2.tgz#808447504cdb22a2d998ac79810cf1035c710a03"
integrity sha512-R1AmO3GEm97ptM0tjxZjZ1fLnxzN3ZeOEKc85nR7ayqVqKVhMu+dhq5lKa/Y3GdMUR6Yj9GoCnaLp2xy4bV6JQ==
"@tauri-apps/cli-win32-x64-msvc@2.0.0-alpha.2":
version "2.0.0-alpha.2"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.0.0-alpha.2.tgz#f7890a94cd8a0cc70faa831046ca8d8576a357d9"
integrity sha512-cLJJWxCdvvQP+I0B4h6h0TMMNYISoatQu57QVxPqypbkC/lK/ljjrbD5nu7M9wTFBkLkCTGyMC7N99esCmgIBQ==
"@tauri-apps/cli@^2.0.0-alpha.0":
version "2.0.0-alpha.2"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-2.0.0-alpha.2.tgz#bef242ce3c8b286f0ab74595c5e069b0ce7c5b4f"
integrity sha512-M5o2ESOv9jGr7oIDl3sR3Q5++DXSW4xyfxzKCyu1JVGlOc+C9Q4y0dbKhlpd0wPCAxRa0ikbfu7z8qfEhHSpVQ==
"@tauri-apps/cli-darwin-arm64@2.0.0-alpha.6":
version "2.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.0.0-alpha.6.tgz#d4fd5aa715bb3df7513f321636b3bcbade81fe06"
integrity sha512-Oc6EUaXRsAXCapl5EdEqkzMUkCpqQ9ELXhLORwgVTDNYjq11xpe/VxYlVoao/FuEp9DnHvcdZVlgNrEgWb8whQ==
"@tauri-apps/cli-darwin-x64@2.0.0-alpha.6":
version "2.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.0.0-alpha.6.tgz#55455274f6860f2412f99a1b2603bffcdce691e7"
integrity sha512-HhF4XFTsznCzAVXQJd1e+yi1DdVD5PHOXVl2ZjeqmALvci4X/yCZEj4sCg4+Qukvs8BVnDYRvGs7M8cjbJZJoQ==
"@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-alpha.6":
version "2.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.0.0-alpha.6.tgz#88bce2a4714530447d43a0e8bf3bebbc6162980b"
integrity sha512-diHDgkBtx1exs/vlouy0B0MrUkJL0ojCJZcoq3rR76kMk2Gmsxz43AsoQfgziE9BCS2luIwilMuofgKOY4s+Zg==
"@tauri-apps/cli-linux-arm64-gnu@2.0.0-alpha.6":
version "2.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.0.0-alpha.6.tgz#388bfa33cf7dc4ce6676f3be7ebe34fdbab7dfa2"
integrity sha512-g8SpZ3rVUdVIfuuosdnq3U359KF48R374b1G3xUUyebJAwWZ5Bay0P94RW0JNoqbM9Z4UpSedrCgIPcunnmZHw==
"@tauri-apps/cli-linux-arm64-musl@2.0.0-alpha.6":
version "2.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.0.0-alpha.6.tgz#90059465acfd397aeba0d6a12d2bb6fbd6f0fc06"
integrity sha512-RD5u0MoBKruMZK7jp4tcQ9JUU6wx25+m0HfT+WSC3YGV8waRxVT/yxyxH5FEPhsxsT0LUQohOUF2S3oB4/bYIg==
"@tauri-apps/cli-linux-x64-gnu@2.0.0-alpha.6":
version "2.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.0.0-alpha.6.tgz#6d0e6e371168ee38c0657e519f227d01e8e9f181"
integrity sha512-AWJbXJ8bZgwWDorHnCLdLKdz7j9sQqnhKaP+GTNZ2bBUuM03rVYfB5GAOmteqSAXOWfzT/LCLIZIQaZ+Y36vHg==
"@tauri-apps/cli-linux-x64-musl@2.0.0-alpha.6":
version "2.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.0.0-alpha.6.tgz#ad4d978c8babaea424b502e901bf1be20eea2241"
integrity sha512-0+FoSopNCHdwEWmdYdlY+G8WXa2ojFXAqs1vIiJlQ4Z6e1Lv6dmPww+FmhNChW4bSi/HH1PbdPX0FB0WEFnM2g==
"@tauri-apps/cli-win32-ia32-msvc@2.0.0-alpha.6":
version "2.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.0.0-alpha.6.tgz#5db864a62beecfa446db0e9af6afc152d8bdec32"
integrity sha512-JsdlWyP2szDvOXhNMSbDUMxb0t5ppl80AAtUjtNM47nyM2/QtoMYPZ6eIjxmKnss/ZbRCF5eCEgP1v5/x+W/gw==
"@tauri-apps/cli-win32-x64-msvc@2.0.0-alpha.6":
version "2.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.0.0-alpha.6.tgz#7404db576ee00bbbf99399905b9fedaec48159f2"
integrity sha512-RY4aCCIyiwuD0iDxzwvqDSyoMoz6xgoGzWS4Xy2wKvoi/ptUAPRn8uhI3JTLFH4U+qky0KXO1oonBfOTF/pWQw==
"@tauri-apps/cli@^2.0.0-alpha.6":
version "2.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-2.0.0-alpha.6.tgz#bcfef07161f9cf695485488f54559ae02f61c992"
integrity sha512-5apIpCGSuf5fUKYW1Jw0Qi1AAMvlUfr7jX41lhIrpXYeOD+Q8HKlpgpRpUScONfA9TThJBUuOfSVPbEkYMsyfw==
optionalDependencies:
"@tauri-apps/cli-darwin-arm64" "2.0.0-alpha.2"
"@tauri-apps/cli-darwin-x64" "2.0.0-alpha.2"
"@tauri-apps/cli-linux-arm-gnueabihf" "2.0.0-alpha.2"
"@tauri-apps/cli-linux-arm64-gnu" "2.0.0-alpha.2"
"@tauri-apps/cli-linux-arm64-musl" "2.0.0-alpha.2"
"@tauri-apps/cli-linux-x64-gnu" "2.0.0-alpha.2"
"@tauri-apps/cli-linux-x64-musl" "2.0.0-alpha.2"
"@tauri-apps/cli-win32-ia32-msvc" "2.0.0-alpha.2"
"@tauri-apps/cli-win32-x64-msvc" "2.0.0-alpha.2"
"@tauri-apps/cli-darwin-arm64" "2.0.0-alpha.6"
"@tauri-apps/cli-darwin-x64" "2.0.0-alpha.6"
"@tauri-apps/cli-linux-arm-gnueabihf" "2.0.0-alpha.6"
"@tauri-apps/cli-linux-arm64-gnu" "2.0.0-alpha.6"
"@tauri-apps/cli-linux-arm64-musl" "2.0.0-alpha.6"
"@tauri-apps/cli-linux-x64-gnu" "2.0.0-alpha.6"
"@tauri-apps/cli-linux-x64-musl" "2.0.0-alpha.6"
"@tauri-apps/cli-win32-ia32-msvc" "2.0.0-alpha.6"
"@tauri-apps/cli-win32-x64-msvc" "2.0.0-alpha.6"
cross-spawn@^7.0.3:
version "7.0.3"

Loading…
Cancel
Save