Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/webpack-5.76.0
Browse files Browse the repository at this point in the history
  • Loading branch information
spencer-nelson authored Jul 10, 2023
2 parents 0bb6790 + 16b3316 commit 897c867
Show file tree
Hide file tree
Showing 5,297 changed files with 55,792 additions and 12,120 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
18 changes: 18 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,24 @@ jobs:
print(invalid_asset_dirs)
exit(1)
"""
valid-asset-fills:
name: Validate Asset Fills
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Check that all SVGs have the right fill
run: |
error_found=false
for file in $(find ./assets -type f -name "*.svg" -exec grep -L 'fill="#212121"' {} \;); do
echo "Error: $file does not have 'fill=\"#212121\"' or has a different fill."
error_found=true
done
if [[ $error_found == true ]]; then
exit 1
fi
build-ios:
name: Build iOS library
Expand Down
29 changes: 15 additions & 14 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -221,20 +221,21 @@ jobs:
build-root-directory: android
wrapper-directory: android

- name: Publish to Maven Central
uses: eskatos/gradle-command-action@v1
env:
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
GPG_SIGNING_KEY_ID: ${{ secrets.GPG_SIGNING_KEY_ID }}
GPG_SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}
SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
VERSION_NAME: ${{ env.NEW_VERSION }}
with:
arguments: publishReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository
build-root-directory: android
wrapper-directory: android
# Temporarily commenting out the publishing to Maven Central, as it is blocking the release for other platforms
# - name: Publish to Maven Central
# uses: eskatos/gradle-command-action@v1
# env:
# OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
# OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
# GPG_SIGNING_KEY_ID: ${{ secrets.GPG_SIGNING_KEY_ID }}
# GPG_SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
# SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}
# SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
# VERSION_NAME: ${{ env.NEW_VERSION }}
# with:
# arguments: publishReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository
# build-root-directory: android
# wrapper-directory: android

- name: Generate BUILD.gn file for Android
run: python3 generate_build_gn_android.py
Expand Down
7 changes: 7 additions & 0 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// swift-tools-version: 5.7
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription

let package = Package(
name: "FluentIcons",
products: [
// Products define the executables and libraries a package produces, and make them visible to other packages.
.library(
name: "FluentIcons",
targets: ["FluentIcons"]),
],
dependencies: [
// Dependencies declare other packages that this package depends on.
// .package(url: /* package url */, from: "1.0.0"),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
// Targets can depend on other targets in this package, and on products in packages this package depends on.
.target(
name: "FluentIcons",
dependencies: [],
path: "ios/FluentIcons"
)
]
)
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Fluent UI System Icons

![CI](https://github.com/microsoft/fluentui-system-icons/workflows/CI/badge.svg)
![Pull request validation](https://github.com/microsoft/fluentui-system-icons/actions/workflows/pr.yml/badge.svg)

Fluent UI System Icons are a collection of familiar, friendly and modern icons from Microsoft.

![fluent system icons](art/readme-banner.png)
![Fluent System Icons](art/readme-banner.png)

## Icon List

[View the full list of regular icons](icons_regular.md)
- [View the full list of regular icons](icons_regular.md)

[View the full list of filled icons](icons_filled.md)
- [View the full list of filled icons](icons_filled.md)

## Installation

Expand All @@ -25,10 +25,10 @@ repositories {
}
```

Include the following dependency in your project's `build.gradle`
Include the following dependency in your project's `build.gradle`:

```groovy
implementation 'com.microsoft.design:fluent-system-icons:1.1.199@aar'
implementation 'com.microsoft.design:fluent-system-icons:1.1.206@aar'
```

For library docs, see [android/README.md](android/README.md).
Expand All @@ -40,13 +40,13 @@ For library docs, see [android/README.md](android/README.md).
```ruby
use_frameworks!

pod "FluentIcons", "1.1.199"
pod "FluentIcons", "1.1.206"
```

#### Carthage

```bash
git "[email protected]:microsoft/fluentui-system-icons.git" "1.1.199"
git "[email protected]:microsoft/fluentui-system-icons.git" "1.1.206"
```

For library docs, see [ios/README.md](ios/README.md).
Expand All @@ -58,10 +58,10 @@ In the `pubspec.yaml` of your flutter project, add the following dependency:
```yaml
dependencies:
...
fluentui_system_icons: ^1.1.199
fluentui_system_icons: ^1.1.206
```
For library docs, see [flutter/README.md](flutter/README.md)
For library docs, see [flutter/README.md](flutter/README.md).
### Plain svg
Expand All @@ -73,20 +73,20 @@ Inline svg directly. See [packages/svg-icons/README.md](packages/svg-icons/READM
The importer generates the Android and iOS libraries from the icons in the `assets` directory.

Jump into the directory
Jump into the directory:

```
cd importer
```

Install npm dependencies
Install npm dependencies:

```
npm install
npm run clean
```

List all the available commands
List all the available commands:

```
npm run
Expand All @@ -112,7 +112,7 @@ You can build and run the demo apps following the steps below.
Prerequisite: Make sure you have flutter configured in Android Studio

1. Open the [flutter](flutter) directory in Android Studio
2. Select the 'example' in the directory and open it in Android Studio
2. Select the `example` in the directory and open it in Android Studio
3. Click run

## Contact
Expand Down
Loading

0 comments on commit 897c867

Please sign in to comment.