Updated dependencies

chRyNaN · Feb 27, 2023 · aaf851f · aaf851f
1 parent 36a088e
commit aaf851f
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 23 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,10 +12,10 @@ buildscript {
  }
  dependencies {
  classpath("com.android.tools.build:gradle:4.2.2")
- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
- classpath("org.jetbrains.kotlin:kotlin-serialization:1.7.10")
- classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.7.10")
- classpath("org.jetbrains.compose:compose-gradle-plugin:1.2.0-beta02")
+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0")
+ classpath("org.jetbrains.kotlin:kotlin-serialization:1.8.0")
+ classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.7.20")
+ classpath("org.jetbrains.compose:compose-gradle-plugin:1.3.0")
  }
 }
 

diff --git a/buildSrc/src/main/java/com.chrynan.navigation.buildSrc/OSUtils.kt b/buildSrc/src/main/java/com.chrynan.navigation.buildSrc/OSUtils.kt
@@ -0,0 +1,9 @@
+package com.chrynan.navigation.buildSrc
+
+import java.lang.System
+
+fun isBuildingOnOSX(): Boolean {
+ val osName = System.getProperty("os.name").toLowerCase()
+
+ return osName.contains("mac os x") || osName.contains("darwin") || osName.contains("osx")
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/navigation-compose/build.gradle.kts b/navigation-compose/build.gradle.kts
@@ -1,4 +1,5 @@
 import com.chrynan.navigation.buildSrc.LibraryConstants
+import com.chrynan.navigation.buildSrc.isBuildingOnOSX
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -23,8 +24,10 @@ kotlin {
  js(IR) {
  browser()
  }
- ios()
- iosSimulatorArm64()
+ if (isBuildingOnOSX()) {
+ ios()
+ iosSimulatorArm64()
+ }
  }
  sourceSets {
  all {
@@ -39,6 +42,11 @@ kotlin {
  implementation(compose.foundation)
  }
  }
+ if (isBuildingOnOSX()) {
+ val iosMain by sourceSets.getting
+ val iosSimulatorArm64Main by sourceSets.getting
+ iosSimulatorArm64Main.dependsOn(iosMain)
+ }
  }
 }
 

diff --git a/navigation-core/build.gradle.kts b/navigation-core/build.gradle.kts
@@ -1,4 +1,5 @@
 import com.chrynan.navigation.buildSrc.LibraryConstants
+import com.chrynan.navigation.buildSrc.isBuildingOnOSX
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -19,12 +20,14 @@ kotlin {
  targets {
  android()
  jvm()
- js(BOTH) {
+ js(IR) {
  browser()
  nodejs()
  }
- ios()
- iosSimulatorArm64()
+ if (isBuildingOnOSX()) {
+ ios()
+ iosSimulatorArm64()
+ }
  }
  sourceSets {
  all {
@@ -37,9 +40,11 @@ kotlin {
  api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
  }
  }
- val iosMain by sourceSets.getting
- val iosSimulatorArm64Main by sourceSets.getting
- iosSimulatorArm64Main.dependsOn(iosMain)
+ if (isBuildingOnOSX()) {
+ val iosMain by sourceSets.getting
+ val iosSimulatorArm64Main by sourceSets.getting
+ iosSimulatorArm64Main.dependsOn(iosMain)
+ }
  }
 }
 
@@ -85,10 +90,10 @@ tasks.withType<Jar> { duplicatesStrategy = DuplicatesStrategy.INHERIT }
 
 // Android Specific Dependencies
 dependencies {
- implementation("androidx.activity:activity-ktx:1.6.0")
- implementation("androidx.fragment:fragment-ktx:1.5.3")
+ implementation("androidx.activity:activity-ktx:1.6.1")
+ implementation("androidx.fragment:fragment-ktx:1.5.5")
  implementation("androidx.core:core-ktx:1.9.0")
- implementation("androidx.appcompat:appcompat:1.5.1")
+ implementation("androidx.appcompat:appcompat:1.6.1")
 
  api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
 }

diff --git a/sample-compose/build.gradle.kts b/sample-compose/build.gradle.kts
@@ -17,7 +17,7 @@ android {
  defaultConfig {
  applicationId = "com.chrynan.navigation.sample.compose"
  minSdk = 26
- targetSdk = 31
+ targetSdk = 33
  versionCode = 1
  versionName = "1.0"
 
@@ -49,18 +49,18 @@ android {
 tasks.withType<Jar> { duplicatesStrategy = DuplicatesStrategy.INHERIT }
 
 dependencies {
- implementation("androidx.core:core-ktx:1.8.0")
- implementation("androidx.appcompat:appcompat:1.5.0")
+ implementation("androidx.core:core-ktx:1.9.0")
+ implementation("androidx.appcompat:appcompat:1.6.1")
  implementation("com.google.android.material:material:1.6.1")
 
  implementation(compose.runtime)
  implementation(compose.ui)
  implementation(compose.material)
 
- implementation("androidx.compose.compiler:compiler:1.3.0")
- implementation("androidx.compose.ui:ui-tooling:1.3.0-alpha03")
- implementation("androidx.activity:activity-compose:1.5.1")
- implementation("androidx.compose.material:material-icons-extended:1.3.0-alpha03")
+ implementation("androidx.compose.compiler:compiler:1.4.3")
+ implementation("androidx.compose.ui:ui-tooling:1.4.0-beta02")
+ implementation("androidx.activity:activity-compose:1.6.1")
+ implementation("androidx.compose.material:material-icons-extended:1.4.0-beta02")
 
  implementation("com.chrynan.presentation:presentation-compose:0.7.1")
  implementation("com.chrynan.colors:colors-compose:0.7.2")