diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 4fee12e..ae231f8 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -27,7 +27,11 @@ val derakkumaKeyAlias = signingProperty("KEY_ALIAS") ?: "derakkuma" val derakkumaKeyPassword = signingProperty("KEY_PASSWORD") ?: derakkumaKeystorePassword val requestedReleaseBuild = gradle.startParameter.taskNames.any { taskName -> - taskName.contains("Release", ignoreCase = true) + val normalized = taskName.removePrefix(":") + val isAndroidAppTask = !normalized.contains(":") || normalized.startsWith("androidApp:") + val name = normalized.substringAfterLast(':') + val isIosFrameworkTask = name.contains("Framework") || name.contains("Ios", ignoreCase = true) + isAndroidAppTask && !isIosFrameworkTask && name.contains("Release", ignoreCase = true) } if (requestedReleaseBuild) { diff --git a/gradle.properties b/gradle.properties index fe5adc5..681dce7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8 kotlin.code.style=official android.useAndroidX=true android.nonTransitiveRClass=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 74411b9..6859fba 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ androidx-activity = "1.10.1" androidx-lifecycle = "2.9.0" androidx-browser = "1.8.0" androidx-core = "1.17.0" -navigation-compose = "2.9.0" +navigation-compose = "2.10.0-alpha02" datastore = "1.1.7" sqldelight = "2.1.0" coil = "3.4.0" diff --git a/iosApp/Derakkuma.xcodeproj/project.pbxproj b/iosApp/Derakkuma.xcodeproj/project.pbxproj index 69d32e1..22d25e8 100644 --- a/iosApp/Derakkuma.xcodeproj/project.pbxproj +++ b/iosApp/Derakkuma.xcodeproj/project.pbxproj @@ -216,6 +216,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; + DEVELOPMENT_TEAM = CFPXZ3S47H; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../composeApp/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", @@ -234,7 +235,7 @@ ComposeApp, "-lsqlite3", ); - PRODUCT_BUNDLE_IDENTIFIER = com.derakkuma; + PRODUCT_BUNDLE_IDENTIFIER = com.derakkuma.ios; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -305,6 +306,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; + DEVELOPMENT_TEAM = CFPXZ3S47H; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../composeApp/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", @@ -323,7 +325,7 @@ ComposeApp, "-lsqlite3", ); - PRODUCT_BUNDLE_IDENTIFIER = com.derakkuma; + PRODUCT_BUNDLE_IDENTIFIER = com.derakkuma.ios; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; }; diff --git a/iosApp/iosApp/Info.plist b/iosApp/iosApp/Info.plist index d6dca72..1244e30 100644 --- a/iosApp/iosApp/Info.plist +++ b/iosApp/iosApp/Info.plist @@ -123,7 +123,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.1.0 + 0.6.0 CFBundleURLTypes diff --git a/iosApp/project.yml b/iosApp/project.yml index 5e44482..475b455 100644 --- a/iosApp/project.yml +++ b/iosApp/project.yml @@ -19,7 +19,7 @@ targets: path: iosApp/Info.plist properties: CFBundleDisplayName: Derakkuma - CFBundleShortVersionString: "0.1.0" + CFBundleShortVersionString: "0.6.0" CFBundleVersion: "1" UILaunchScreen: {} CADisableMinimumFrameDurationOnPhone: true