Skip to content

Commit

Permalink
Merge pull request #1 from FreshKernel/feat/migrate-to-kotlin-2.0.10
Browse files Browse the repository at this point in the history
feat: migrate to kotlin 2.0.10
  • Loading branch information
EchoEllet authored Sep 3, 2024
2 parents fb8a89a + 2842350 commit 7040799
Show file tree
Hide file tree
Showing 79 changed files with 635 additions and 545 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: 🏗️ Build

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]
jobs:
build:
name: 🧱️ Build and Test the Script
runs-on: ubuntu-latest
timeout-minutes: 5

steps:
- name: 📥 Clone Repository
uses: actions/checkout@v4

- name: 🔍 Validate Gradle Wrapper
uses: gradle/actions/wrapper-validation@v3

- name: ☕ Setup JDK 17
uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'adopt'
# https://github.com/gradle/actions/blob/main/docs/setup-gradle.md#incompatibility-with-other-caching-mechanisms

- name: 🛠️ Setup Gradle
uses: gradle/actions/setup-gradle@v3
with:
# Double check to validate the Gradle wrapper
validate-wrappers: true
cache-disabled: false

- name: 📥 Build & Test 🧪 with Gradle
run: ./gradlew build --stacktrace

- name: 🚀 Deploy
if: github.ref == 'refs/heads/main'
env:
deploy_url: ${{ secrets.RENDER_DEPLOY_HOOK_URL }}
run: |
curl "$deploy_url"
68 changes: 0 additions & 68 deletions .github/workflows/main.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ kotlin-js-store
# Gradle ignores
.gradle

.kotlin
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2024 Fresh Platform
Copyright (c) 2024 Fresh Kernel

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
kotlin.code.style=official
kotlin.code.style=official
13 changes: 7 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
[versions]
jetbrains-compose = "1.6.1"
kobweb = "0.17.1"
kotlin = "1.9.23"
jetbrains-compose = "1.6.11"
kobweb = "0.19.0"
kotlin = "2.0.10"

[libraries]
compose-html-core = { module = "org.jetbrains.compose.html:html-core", version.ref = "jetbrains-compose" }
compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "jetbrains-compose" }
kobweb-api = { module = "com.varabyte.kobweb:kobweb-api", version.ref = "kobweb" }
kobweb-core = { module = "com.varabyte.kobweb:kobweb-core ", version.ref = "kobweb" }
kobweb-silk = { module = "com.varabyte.kobweb:kobweb-silk", version.ref = "kobweb" }
silk-icons-fa = { module = "com.varabyte.kobwebx:silk-icons-fa", version.ref = "kobweb" }
silk-icons-mdi = { module = "com.varabyte.kobwebx:silk-icons-mdi", version.ref = "kobweb" }

[plugins]
jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "jetbrains-compose" }
kobweb-application = { id = "com.varabyte.kobweb.application", version.ref = "kobweb" }
kobweb-library = { id = "com.varabyte.kobweb.library", version.ref = "kobweb" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kobweb-application = { id = "com.varabyte.kobweb.application", version.ref = "kobweb" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
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-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 7040799

Please sign in to comment.