Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
71265bd
Comment out the Maven local repositories for Gradle `buildSrc` and pr…
ShreckYe Oct 24, 2024
755a259
Bump the project version
ShreckYe Oct 24, 2024
2f09b5b
Add the "Java with Gradle" GitHub Actions template without editing it…
ShreckYe Nov 2, 2024
a57a608
Update the workflow file to run on all branches, all OSs, use JDK 21,…
ShreckYe Nov 2, 2024
31dd23d
Remove comments in the workflow and rename it
ShreckYe Nov 2, 2024
f1de59a
Add the GitHub Actions "GitHub Pages Jekyll" workflow template withou…
ShreckYe Nov 2, 2024
bd53c1d
Update "jekyll-gh-pages.yml" partially and rename it
ShreckYe Nov 2, 2024
fdb1ae7
Fix the runner list format in the workflow file
ShreckYe Nov 2, 2024
38a04f0
Fix the multiple runner format
ShreckYe Nov 2, 2024
2d6e8c5
Downgrade the JDK to 8 to be consistent with the JVM toolchain versio…
ShreckYe Nov 2, 2024
1e4a711
Add a "side by side" site distribution to the demo and publish it to …
ShreckYe Nov 3, 2024
325f4ae
Bump the JVM version to 11 in the workflow file:
ShreckYe Nov 3, 2024
82a9e40
Bump the JDK version to 17 in the workflow file
ShreckYe Nov 3, 2024
98a5268
Bump the JDK version to 17 in the workflow file
ShreckYe Nov 3, 2024
0b2a7ff
Set up JDK 8 too for the JVM toolchain version in the "check" job
ShreckYe Nov 3, 2024
cd3a2e6
Reformat "ci.yml" with IntelliJ IDEA
ShreckYe Nov 3, 2024
eccc63f
Use Azul Zulu OpenJDK 8 because Eclipse Temurin's is not available on…
ShreckYe Nov 4, 2024
324c554
Deploy the demo only on the "release" branch to reduce noise since it…
ShreckYe Nov 4, 2024
cf7b9bb
Comment out CI runs on pull requests since already runs on all pushes
ShreckYe Nov 4, 2024
808b94b
Merge branch 'github-actions-ci' into github-actions-and-github-pages
ShreckYe Nov 4, 2024
263c476
Merge pull request #41 from huanshankeji/github-pages-demo
ShreckYe Nov 4, 2024
5e0294d
Merge pull request #40 from huanshankeji/github-actions-and-github-pages
ShreckYe Nov 4, 2024
8fc183b
Update README.md about the newly deployed side-by-side demo site
ShreckYe Nov 4, 2024
8a07be7
Make the titles in the site-by-side demo links
ShreckYe Nov 6, 2024
c3ddcfd
Create CODE_OF_CONDUCT.md
ShreckYe Nov 7, 2024
66fc362
Create CONTRIBUTING.md
ShreckYe Nov 7, 2024
0d109d2
Apply the binary compatibility validator Gradle plugin
ShreckYe Nov 8, 2024
38b4852
Run `apiDump`
ShreckYe Nov 8, 2024
48b0806
Simplify a line of code
ShreckYe Nov 11, 2024
58e04ef
Show `Spacer`s in the demo
ShreckYe Nov 11, 2024
fcdae05
Delegate `Spacer` just to `DivBox` on JS DOM because the Kobweb `Spac…
ShreckYe Nov 11, 2024
902b931
Rename the project to "Compose Multiplatform HTML Unified", and updat…
ShreckYe Nov 30, 2024
5a8aed5
Reference a corresponding issue in a TODO
ShreckYe Nov 30, 2024
1437677
Run IntelliJ IDEA Code Cleanup, revert some changes, and add some TODOs
ShreckYe Nov 30, 2024
fccc380
Run IntelliJ IDEA Reformat Code on the whole project, and manually re…
ShreckYe Nov 30, 2024
670eecc
Replace all occurrences of "androidxCommon"/"AndroidxCommon" with "co…
ShreckYe Nov 30, 2024
f661ac6
Bump the project version
ShreckYe Nov 30, 2024
b81b525
Merge pull request #46 from huanshankeji/rename-project
ShreckYe Nov 30, 2024
1d18919
Replace occurrences of "Compose Multiplatform Material" with the new …
ShreckYe Nov 30, 2024
bf8e956
Replace occurrences of "Androidx" with "ComposeUi" too, and revert so…
ShreckYe Nov 30, 2024
4b71225
Bump Compose Multiplatform to 1.7.1
ShreckYe Nov 30, 2024
f105d22
Bump the Gradle wrapper to the latest version of v8.11.1 which depend…
ShreckYe Dec 2, 2024
8a41df2
Find the remaining occurrences of "compose-multiplatform-material" in…
ShreckYe Dec 3, 2024
d2d7711
Find more occurrences of "androidx", review them, and replace some of…
ShreckYe Dec 3, 2024
114b1ce
Merge pull request #47 from huanshankeji/rename-project
ShreckYe Dec 3, 2024
ecb442e
Merge pull request #48 from huanshankeji/compose-multiplatform-v1.7.1
ShreckYe Dec 3, 2024
4afdcf3
Merge commit 'f105d22c4c570efd92ba8db893f659e872204bc9'
ShreckYe Dec 3, 2024
fd061b6
Bump Kotlin to 2.1.0 and remove the obsolete comment
ShreckYe Dec 3, 2024
f170582
Run `kotlinUpgradeYarnLock`
ShreckYe Dec 3, 2024
e2fcc56
Run `apiDump`
ShreckYe Dec 3, 2024
82f7073
Exclude the unneeded subprojects in API validation, remove their "api…
ShreckYe Dec 3, 2024
eaab148
Simplify the previous commit
ShreckYe Dec 3, 2024
100a3a9
Run IntelliJ IDEA Code Cleanup again
ShreckYe Dec 4, 2024
a8705e5
Replace the deprecated opt-ins
ShreckYe Dec 4, 2024
58da79f
Move the hierarchy template to `common-conventions` and move the `com…
ShreckYe Dec 4, 2024
5d493aa
Fix the bug that the demo Xcode project fails to build because of the…
ShreckYe Dec 4, 2024
9265d9a
Bump our common-gradle-dependencies to v0.9.0-20241203 and our Gradle…
ShreckYe Dec 4, 2024
582dd27
Initially add some change log for v0.5.0
ShreckYe Dec 5, 2024
6d64970
Complete the change log for v0.5.0
ShreckYe Dec 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
56 changes: 56 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: CI

on:
push:
branches: [ "*" ]
# pull_request:
# branches: [ "*" ]

jobs:
check:

strategy:
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
runs-on: ${{ matrix.os }}
permissions:
contents: read

steps:
- uses: actions/checkout@v4
- name: Set up JDK 8
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'zulu'
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Check with Gradle Wrapper
run: ./gradlew check

dependency-submission:

strategy:
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
runs-on: ${{ matrix.os }}
permissions:
contents: write

steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'

- name: Generate and submit dependency graph
uses: gradle/actions/dependency-submission@v4
61 changes: 61 additions & 0 deletions .github/workflows/demo-gh-pages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Deploy the demo to GitHub Pages

on:
push:
branches: [ "release" ]
pull_request:
branches: [ "release" ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Build job
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Pages
uses: actions/configure-pages@v5

- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: "17"
distribution: "temurin"

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Build the distribution with Gradle Wrapper
run: ./gradlew :compose-multiplatform-html-unified-demo:sideBySideBrowserDistribution

- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
path: demo/build/dist/sideBySide/productionExecutable/

# Deployment job
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
# Change log

## v0.5.0 / 2024-12-05

Important changes:

* This library is renamed from **Compose Multiplatform Material** to **Compose Multiplatform HTML Unified** which better describes its purpose since this release. The **Maven coordinates** have changed accordingly. Please adapt to these changes following the updated README.md.
* replace the terms "Androidx"/"androidx"/"AndroidxCommon"/"androidxCommon" with Compose UI / "ComposeUi" / "composeUi" at appropriate places, both in docs and in code

This introduces some breaking changes. Please adapt accordingly. We are sorry for the inconvenience.

Functional change:

* delegate `Spacer` just to `DivBox` on JS DOM because the Kobweb `Spacer` has a different semantic from the Compose UI one

Miscellaneous changes:

* bump Kotlin to 2.1.0, Compose Multiplatform to 1.7.1, and Kobweb to 0.20.0
* add a "side by side" demo hosted at <https://huanshankeji.github.io/compose-multiplatform-html-unified/>
* add CODE_OF_CONDUCT.md and CONTRIBUTING.md
* use the Kotlin binary compatibility validator
* run IntelliJ IDEA Code Cleanup and Reformat Code on the whole project

## v0.4.0 / 2024-10-24

* fix a bug that a dependent project might crash on Android and add the Android target explicitly for all modules
Expand Down
128 changes: 128 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
shreckye@gmail.com.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series
of actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
the community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.

Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.
23 changes: 23 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Contributing guidelines

Hello, thank you for your interest in contributing to our project.

## Issues and Discussions

You are welcome to submit issues on bugs or feature requests. If you have questions, please ask them in GitHub Discussions.

## Pull requests

If you want to contribute to the code of our project, you are welcome to open pull requests. However, it's always a good idea to open a related issue or talk with us in Discussions first.

## Development

Please make sure you have a valid JDK installed. Some projects may require multiple JDKs of different versions. The JDK version we use can be found in the [GitHub Actions workflow files](.github/workflows).

We recommend developing with IntelliJ IDEA. In IntelliJ IDEA, select the correct [Project SDK in Project Structure](https://www.jetbrains.com/help/idea/project-settings-and-structure.html#project-sdk) and it's recommended to set [Gradle JVM](https://www.jetbrains.com/help/idea/gradle-jvm-selection.html#jvm_settings) to "Project SDK".

Run the `publishToMavenLocal` Gradle task to publish the libraries to your machine's Maven Local Repository so your projects can depend on the changes you have made, run `check` to ensure our limited number of tests pass.

## Furthur notice

We are currently a small team with limited effort. While we may not always implement your requested features, merge your pull requests, or do such things in time, you are always welcome to create your own fork and make any changes you like.
Loading
Loading