Skip to content

Commit

Permalink
chore: Update Gradle, Kotlin, and dependencies
Browse files Browse the repository at this point in the history
This commit updates the project's build system and dependencies, including:

- Upgrading Gradle
 to version 8.10.2.
- Updating the Kotlin compiler to version 2.1.0-dev-875.
- Updating various dependencies including Compose plugin, Ktor, and AndroidX libraries.
- Modifying web app build configuration and script files for better optimization and organization
.
- Removing outdated build phase from iOS project, likely related to CocoaPods.
- Minor cleanup of project files, such as adding SPDX license identifier and removing a .kotlin file.
  • Loading branch information
SEAbdulbasit committed Oct 18, 2024
1 parent 7434f56 commit 196690b
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 12 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ shared/shared.podspec
/webApp/.gradle/
/webApp/build/
/secret.properties
/.kotlin
7 changes: 2 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@
# ...
coilVersion = "3.0.0-alpha08"
kotlin = "2.1.0-dev-875"
agp = "8.4.2"
androidx-activityCompose = "1.9.0"
androidx-ui-tooling = "1.6.8"
compose-plugin = "1.7.0-alpha01"
agp = "8.7.1"
compose-plugin = "1.7.0-rc01"
kotlinxCoroutinesSwing = "1.8.1"
kotlinxDatetime = "0.6.0"
kotlinxSerializationJson = "1.6.3"
ktor = "2.3.12"
coreKtx = "1.13.1"
ktorClientOkhttp = "3.0.0-wasm2"
material = "1.12.0"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 5 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
4 changes: 2 additions & 2 deletions iosApp/iosApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
7555FF77242A565900829871 /* Sources */,
7555FF79242A565900829871 /* Resources */,
9964867F0862B4D9FB6ABFC7 /* Frameworks */,
43936239B39A65FFE875C396 /* [CP] Copy Pods Resources */,
5BA6441DEBC3167FB2D2554A /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -161,7 +161,7 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
43936239B39A65FFE875C396 /* [CP] Copy Pods Resources */ = {
5BA6441DEBC3167FB2D2554A /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand Down
3 changes: 1 addition & 2 deletions webApp/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig

plugins {
Expand Down Expand Up @@ -39,7 +38,7 @@ kotlin {
binaries.executable()
}

@OptIn(ExperimentalWasmDsl::class)
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
wasmJs {
moduleName = "webApp"
browser {
Expand Down

0 comments on commit 196690b

Please sign in to comment.