Skip to content

Commit

Permalink
chore(main): release 1.1.0 (#9)
Browse files Browse the repository at this point in the history
🤖 I have created a release *beep* *boop*
---

##
[1.1.0](1.0.0...v1.1.0)
(2024-10-25)

### ✨ New Features

* Add positive button variant
([4e05e08](4e05e08))
* Updating font to IBM Plex Sans
([bd9e361](bd9e361))
* Updating font to IBM Plex Sans
([5c3cfc3](5c3cfc3))

### 🪲 Bug Fixes

* Updated colours to match Zeta
([#5](#5))
([4e05e08](4e05e08))

### 📈 Documentation

* Update button docs
([4e05e08](4e05e08))
* Update readme, fix broken links, update icons docs
([445100e](445100e))

### ⛓️ Dependencies

* **automated:** Update icons
([#8](#8))
([990ec23](990ec23))
* **automated:** Update icons 2024-10-18
([60249ed](60249ed))
* **automated:** Update icons 2024-10-18
([00aeae9](00aeae9))
* Update gradle, android compileSdk 34 and other dependencies
([#6](#6))
([445100e](445100e))

### 🧹 Miscellaneous Chores

* Add version to example app
([4e05e08](4e05e08))
* Organise / clean code using Android studio built in tools
([445100e](445100e))
* Remove unnecessary icons from example app
([4e05e08](4e05e08))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
  • Loading branch information
thelukewalton authored and github-actions committed Oct 25, 2024
1 parent 4e05e08 commit 793e8a4
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
uses: gradle/actions/setup-gradle@v4
- name: Add environment variables
run: |
echo "artifactoryusername=${{secrets.ARTIFACTORY_USERNAME}}" >> gradle.properties
echo "artifactorypassword=${{secrets.ARTIFACTORY_PASSWORD}}" >> gradle.properties
echo "mavenUsername=${{secrets.ARTIFACTORY_USERNAME}}" >> gradle.properties
echo "mavenPassword=${{secrets.ARTIFACTORY_PASSWORD}}" >> gradle.properties
echo "zds-android-maven=${{secrets.ZDS_ANDROID_MAVEN}}" >> gradle.properties
- name: Publish
Expand Down
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "1.0.0"
".": "1.1.0"
}
36 changes: 36 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Changelog

## [1.1.0](https://github.com/ZebraDevs/zds-android/compare/1.0.0...v1.1.0) (2024-10-25)


### ✨ New Features

* Add positive button variant ([4e05e08](https://github.com/ZebraDevs/zds-android/commit/4e05e086135cf9cd557903bcf68265ce1dc75893))
* Updating font to IBM Plex Sans ([bd9e361](https://github.com/ZebraDevs/zds-android/commit/bd9e36102f864d9bdda95c58ae572df7c9ac4716))
* Updating font to IBM Plex Sans ([5c3cfc3](https://github.com/ZebraDevs/zds-android/commit/5c3cfc3846794b457a84325c5a528cb9e7e6e1b7))


### 🪲 Bug Fixes

* Updated colours to match Zeta ([#5](https://github.com/ZebraDevs/zds-android/issues/5)) ([4e05e08](https://github.com/ZebraDevs/zds-android/commit/4e05e086135cf9cd557903bcf68265ce1dc75893))


### 📈 Documentation

* Update button docs ([4e05e08](https://github.com/ZebraDevs/zds-android/commit/4e05e086135cf9cd557903bcf68265ce1dc75893))
* Update readme, fix broken links, update icons docs ([445100e](https://github.com/ZebraDevs/zds-android/commit/445100e9ad9f4a6a63f16f14a5f053bb73bbf1ac))


### ⛓️ Dependencies

* **automated:** Update icons ([#8](https://github.com/ZebraDevs/zds-android/issues/8)) ([990ec23](https://github.com/ZebraDevs/zds-android/commit/990ec23854d3a9f2f95b072df6e5a0848030d875))
* **automated:** Update icons 2024-10-18 ([60249ed](https://github.com/ZebraDevs/zds-android/commit/60249edf1090257f78e8bae50fbdd011a988aeba))
* **automated:** Update icons 2024-10-18 ([00aeae9](https://github.com/ZebraDevs/zds-android/commit/00aeae93ce5acb61acf2127f2615ab40f6be91da))
* Update gradle, android compileSdk 34 and other dependencies ([#6](https://github.com/ZebraDevs/zds-android/issues/6)) ([445100e](https://github.com/ZebraDevs/zds-android/commit/445100e9ad9f4a6a63f16f14a5f053bb73bbf1ac))


### 🧹 Miscellaneous Chores

* Add version to example app ([4e05e08](https://github.com/ZebraDevs/zds-android/commit/4e05e086135cf9cd557903bcf68265ce1dc75893))
* Organise / clean code using Android studio built in tools ([445100e](https://github.com/ZebraDevs/zds-android/commit/445100e9ad9f4a6a63f16f14a5f053bb73bbf1ac))
* Remove unnecessary icons from example app ([4e05e08](https://github.com/ZebraDevs/zds-android/commit/4e05e086135cf9cd557903bcf68265ce1dc75893))
34 changes: 23 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ Once logged in with SSO, select your username in the top right corner, and selec
These credentials will need to be passed into Gradle, but they should not be committed to source control. It is recommended for individuals to save their username and password in their global `gradle.properties` file in the `<USER_HOME>/.gradle` directory (This file may need to be created). The following format is only an example, and any names can be given.

```gradle
artifactusername=XXX
artifactpassword=YYY
mavenUsername=XXX
mavenPassword=YYY
```

These credentials should **_never_** be shared.
Expand All @@ -38,8 +38,8 @@ dependencyResolutionManagement {
maven{
url "https://artifactory-us.zebra.com/artifactory/dmo-mvn-rel/"
credentials {
username = "${artifactusername}"
password = "${artifactpassword}"
username = "${mavenUsername}"
password = "${mavenPassword}"
}
}
}
Expand All @@ -64,8 +64,8 @@ dependencyResolutionManagement {
maven{
url = uri("https://artifactory-us.zebra.com/artifactory/dmo-mvn-rel/")
credentials {
username = getProperty("artifactoryusername")
password = getProperty("artifactorypassword")
username = getProperty("mavenUsername")
password = getProperty("mavenPassword")
}
}
}
Expand All @@ -74,7 +74,11 @@ dependencyResolutionManagement {

</details>

### 4. Add dependency to app build file
### 4. Run gradle build

This step is needed to ensure that gradle can sync and pull data from the maven repository. In Android studio, click the 'Make Module' button in the toolbar (hammer icon).

### 5. Add dependency to app build file

This file should be located within the app directory of your project (not the root level); below are examples for both `build.gradle` and `build.gradle.kts`

Expand All @@ -85,7 +89,7 @@ This file should be located within the app directory of your project (not the ro
```
dependencies {
...
implementation 'com.zebra:zds:1.0.0'
implementation 'com.zebra:zds:1.1.0'
}
```

Expand All @@ -96,17 +100,25 @@ dependencies {

<!-- x-release-please-start-version -->

dependencies {
...
implementation("com.zebra:zds:1.1.0")
}

<!-- x-release-please-end -->

Once you have done this, and performed a sync and build, the IDE _should_ recommend this line be refactored into the new style below:

```
dependencies {
...
implementation(libs.zds)
}
```

<!-- x-release-please-end -->
</details>

### 5. Add theme to manifest
### 6. Add theme to manifest

For the components to work and receive the correct theme values, we must add the theme in `AndroidManifest.xml`. Be sure to remove other themes which could override this and prevent the components from working.

Expand All @@ -118,7 +130,7 @@ For the components to work and receive the correct theme values, we must add the
/>
```

### 6. Use components
### 7. Use components

```xml
<com.zebra.zds.ZdsButton
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/zebra/zdsDemo/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public void onDrawerOpened(@NonNull View drawerView) {
((TextView) navView.getHeaderView(0).findViewById(R.id.title)).setText("Title");
((TextView) navView.getHeaderView(0).findViewById(R.id.subtitle)).setText("Subtitle");
// x-release-please-start-version
((TextView) findViewById(R.id.footer_subtitle)).setText("ZDS Android v1.0.0");
((TextView) findViewById(R.id.footer_subtitle)).setText("ZDS Android v1.1.0");
// x-release-please-end
((AppCompatImageView) navView.getHeaderView(0).findViewById(R.id.image)).setImageResource(R.drawable.ic_happy_round);
((AppCompatImageView) navView.getHeaderView(0).findViewById(R.id.image)).setImageTintList(ColorStateList.valueOf(Color.WHITE));
Expand Down
6 changes: 3 additions & 3 deletions components/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ publishing {
groupId = 'com.zebra'
artifactId = 'zds'
// x-release-please-start-version
version = '1.0.0'
version = '1.1.0'
// x-release-please-end

afterEvaluate {
Expand All @@ -60,8 +60,8 @@ publishing {
repositories {
maven {
credentials {
username = project.property('artifactoryusername')
password = project.property('artifactorypassword')
username = project.property('mavenUsername')
password = project.property('mavenPassword')
}
url = project.property('zds-android-maven') + project.property('publish')
}
Expand Down
1 change: 1 addition & 0 deletions components/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
-dontwarn java.lang.invoke.LambdaMetafactory

0 comments on commit 793e8a4

Please sign in to comment.