Merge pull request #327 from joreilly/dependency_updates

dependency updates
joreilly · Mar 2, 2024 · 1c33a27 · 1c33a27
2 parents 724b115 + 30bfceb
commit 1c33a27
Show file tree

Hide file tree

Showing 34 changed files with 115 additions and 1,819 deletions.
diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -20,15 +20,15 @@ jobs:
 
 
     - name: Build web app
-      run: ./gradlew :web:assemble
+      run: ./gradlew :compose-web:assemble
 
     # If main branch update, deploy to gh-pages
-    - name: Deploy
-      if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
-      uses: JamesIves/github-pages-deploy-action@v4.5.0
-      with:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        BRANCH: gh-pages # The branch the action should deploy to.
-        FOLDER: web/build/distributions # The folder the action should deploy.
-        CLEAN: true # Automatically remove deleted files from the deploy branch
+#    - name: Deploy
+#      if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
+#      uses: JamesIves/github-pages-deploy-action@v4.5.0
+#      with:
+#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        BRANCH: gh-pages # The branch the action should deploy to.
+#        FOLDER: web/build/distributions # The folder the action should deploy.
+#        CLEAN: true # Automatically remove deleted files from the deploy branch
 
diff --git a/README.md b/README.md
@@ -14,9 +14,7 @@
 * macOS (SwiftUI)
 * Swift Executable Package
 * Desktop (Compose for Desktop)
-* Web (Compose for Web - JS based)
 * Web (Compose for Web - Wasm based)
-* Web (Kotlin/JS + React Wrapper) (contributed by https://github.com/PatilShreyas)
 * JVM (small Ktor back end service + `Main.kt` in `common` module)
 
 It makes use of [Open Notify PeopleInSpace API](http://open-notify.org/Open-Notify-API/People-In-Space/) to show list of people currently in
@@ -65,15 +63,10 @@ To run backend you can either run `./gradlew :backend:run` or run `Server.kt` di
 
 
 
-### Compose for Web client (JS)
-
-The Compose for Web client resides in the `compose-web` module and can be run by
-invoking `./gradlew :compose-web:jsBrowserDevelopmentRun`
-
 ### Compose for Web client (Wasm)
 
 Similarly for Kotlin/Wasm based version
-`./gradlew :compose-web-wasm:wasmBrowserDevelopmentRun
+`./gradlew :compose-web:wasmBrowserDevelopmentRun
 `
 
 ### Compose for Desktop client
@@ -133,21 +126,11 @@ There's a GraphQL module (`graphql-server`) which can be run locally using `./gr
 
 
 
-
-
 **Compose for Desktop**
 <br/>
 <img width="912" alt="Screenshot 2021-10-01 at 16 45 06" src="https://user-images.githubusercontent.com/6302/135652185-4ce9d8e3-f06e-4e9d-9930-3e900267f8bd.png">
 
 
-**Compose for Web**
-<br/>
-<img width="612" alt="Compose for Web Screenshot" src="https://user-images.githubusercontent.com/22000682/229832465-48a12a45-1885-49dc-9f84-026d215f71c8.png">
-
-**Web App (Kotlin/JS + React)**
-<br/>
-<img width="612" alt="Screenshot 2021-06-06 at 23 50 00" src="https://user-images.githubusercontent.com/19620536/120935764-eda82500-c721-11eb-9042-f15ade7473f7.png">
-
 
 
 ### Languages, libraries and tools used

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,7 +14,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers")
         maven("https://jitpack.io")
         maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-coroutines/maven")
         maven("https://oss.sonatype.org/content/repositories/snapshots/")

diff --git a/compose-web-wasm/build.gradle.kts b/compose-web-wasm/build.gradle.kts
diff --git a/compose-web-wasm/src/wasmJsMain/kotlin/ImageLoader.kt b/compose-web-wasm/src/wasmJsMain/kotlin/ImageLoader.kt
diff --git a/compose-web-wasm/src/wasmJsMain/kotlin/Main.kt b/compose-web-wasm/src/wasmJsMain/kotlin/Main.kt
diff --git a/compose-web-wasm/src/wasmJsMain/kotlin/PeopleInSpaceScreen.kt b/compose-web-wasm/src/wasmJsMain/kotlin/PeopleInSpaceScreen.kt