version bumps

android · Mar 13, 2024 · 3f71509 · 3f71509
1 parent 3f11ef4
commit 3f71509
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 23 deletions.
diff --git a/DiceRoller/gradle/libs.versions.toml b/DiceRoller/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
-agp = "8.2.0-beta06"
-compose-compiler = "1.5.3"
-compose-bom = "2023.10.00"
-dataStoreVersion = "1.1.0-alpha05"
-kotlin = "1.9.10"
-ksp = "1.9.10-1.0.13"
-androidx-lifecycle = "2.6.2"
-activityCompose = "1.8.0"
+agp = "8.3.0"
+compose-compiler = "1.5.10"
+compose-bom = "2024.02.02"
+dataStoreVersion = "1.1.0-beta02"
+kotlin = "1.9.22"
+ksp = "1.9.22-1.0.18"
+androidx-lifecycle = "2.7.0"
+activityCompose = "1.8.2"
 skie = "0.5.0"
-atomicfu = "0.22.0"
+atomicfu = "0.23.1"
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

diff --git a/DiceRoller/gradle/wrapper/gradle-wrapper.jar b/DiceRoller/gradle/wrapper/gradle-wrapper.jar
diff --git a/DiceRoller/gradle/wrapper/gradle-wrapper.properties b/DiceRoller/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/DiceRoller/gradlew.bat b/DiceRoller/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

diff --git a/DiceRoller/settings.gradle.kts b/DiceRoller/settings.gradle.kts
@@ -32,7 +32,7 @@ dependencyResolutionManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
 rootProject.name = "Kotlin Multiplatform DataStore Sample"

diff --git a/DiceRoller/shared/build.gradle.kts b/DiceRoller/shared/build.gradle.kts
@@ -24,8 +24,6 @@ version = "1.0"
 
 @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
 kotlin {
-    targetHierarchy.default()
-
     androidLibrary {
         @Suppress("UnstableApiUsage")
         namespace = "com.google.samples.apps.diceroller.shared"

diff --git a/DiceRoller/shared/shared.podspec b/DiceRoller/shared/shared.podspec
@@ -11,6 +11,17 @@ Pod::Spec.new do |spec|
     spec.ios.deployment_target = '14.1'
 
 
+    if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework')
+        raise "
+
+        Kotlin framework 'shared' doesn't exist yet, so a proper Xcode project can't be generated.
+        'pod install' should be executed after running ':generateDummyFramework' Gradle task:
+
+            ./gradlew :shared:generateDummyFramework
+
+        Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
+    end
+
     spec.pod_target_xcconfig = {
         'KOTLIN_PROJECT_PATH' => ':shared',
         'PRODUCT_MODULE_NAME' => 'shared',