Merge branch 'dev' into wry-0.46

tauri-apps · Oct 14, 2024 · 1cafc88 · 1cafc88
2 parents 3b4f053 + b4d615f
commit 1cafc88
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.changes/deprecated-gradle-identifiers.md b/.changes/deprecated-gradle-identifiers.md
@@ -0,0 +1,5 @@
+---
+"cargo-mobile2": "patch"
+---
+
+Remove deprecated options from gradle file in the generated android template.
diff --git a/src/config/app/raw.rs b/src/config/app/raw.rs
@@ -93,7 +93,11 @@ impl Defaults {
             .to_str()
             .ok_or_else(|| DefaultsError::CurrentDirInvalidUtf8(cwd.clone()))?;
         let name = name::transliterate(&dir_name.to_kebab_case());
-        let dot_name = name.as_ref().map(|n| format!(".{n}")).unwrap_or_default();
+        let dot_name = name
+            .as_ref()
+            .map(|n| format!(".{n}"))
+            .unwrap_or_default()
+            .replace("-", "_");
         Ok(Self {
             identifier: default_identifier(wrapper, &dot_name)
                 .ok()

diff --git a/templates/platforms/android-studio/app/build.gradle.kts.hbs b/templates/platforms/android-studio/app/build.gradle.kts.hbs
@@ -7,11 +7,11 @@ plugins {
 android {
     namespace="{{app.identifier}}"{{#if has-asset-packs}}
     assetPacks += mutableSetOf({{quote-and-join-colon-prefix asset-packs}}){{/if}}
-    compileSdk = 33
+    compileSdk = 34
     defaultConfig {
         applicationId = "{{app.identifier}}"
         minSdk = {{android.min-sdk-version}}
-        targetSdk = 33
+        targetSdk = 34
         versionCode = 1
         versionName = "1.0"
     }{{#if android-vulkan-validation}}
@@ -38,9 +38,6 @@ android {
             )
         }
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
 }
 
 rust {