Skip to content

Commit 793e8a4

Browse files
thelukewaltongithub-actions
authored andcommitted
chore(main): release 1.1.0 (#9)
🤖 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).
1 parent 4e05e08 commit 793e8a4

File tree

7 files changed

+67
-18
lines changed

7 files changed

+67
-18
lines changed

.github/workflows/on-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
uses: gradle/actions/setup-gradle@v4
2525
- name: Add environment variables
2626
run: |
27-
echo "artifactoryusername=${{secrets.ARTIFACTORY_USERNAME}}" >> gradle.properties
28-
echo "artifactorypassword=${{secrets.ARTIFACTORY_PASSWORD}}" >> gradle.properties
27+
echo "mavenUsername=${{secrets.ARTIFACTORY_USERNAME}}" >> gradle.properties
28+
echo "mavenPassword=${{secrets.ARTIFACTORY_PASSWORD}}" >> gradle.properties
2929
echo "zds-android-maven=${{secrets.ZDS_ANDROID_MAVEN}}" >> gradle.properties
3030
3131
- name: Publish

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "1.0.0"
2+
".": "1.1.0"
33
}

CHANGELOG.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Changelog
2+
3+
## [1.1.0](https://github.com/ZebraDevs/zds-android/compare/1.0.0...v1.1.0) (2024-10-25)
4+
5+
6+
### ✨ New Features
7+
8+
* Add positive button variant ([4e05e08](https://github.com/ZebraDevs/zds-android/commit/4e05e086135cf9cd557903bcf68265ce1dc75893))
9+
* Updating font to IBM Plex Sans ([bd9e361](https://github.com/ZebraDevs/zds-android/commit/bd9e36102f864d9bdda95c58ae572df7c9ac4716))
10+
* Updating font to IBM Plex Sans ([5c3cfc3](https://github.com/ZebraDevs/zds-android/commit/5c3cfc3846794b457a84325c5a528cb9e7e6e1b7))
11+
12+
13+
### 🪲 Bug Fixes
14+
15+
* Updated colours to match Zeta ([#5](https://github.com/ZebraDevs/zds-android/issues/5)) ([4e05e08](https://github.com/ZebraDevs/zds-android/commit/4e05e086135cf9cd557903bcf68265ce1dc75893))
16+
17+
18+
### 📈 Documentation
19+
20+
* Update button docs ([4e05e08](https://github.com/ZebraDevs/zds-android/commit/4e05e086135cf9cd557903bcf68265ce1dc75893))
21+
* Update readme, fix broken links, update icons docs ([445100e](https://github.com/ZebraDevs/zds-android/commit/445100e9ad9f4a6a63f16f14a5f053bb73bbf1ac))
22+
23+
24+
### ⛓️ Dependencies
25+
26+
* **automated:** Update icons ([#8](https://github.com/ZebraDevs/zds-android/issues/8)) ([990ec23](https://github.com/ZebraDevs/zds-android/commit/990ec23854d3a9f2f95b072df6e5a0848030d875))
27+
* **automated:** Update icons 2024-10-18 ([60249ed](https://github.com/ZebraDevs/zds-android/commit/60249edf1090257f78e8bae50fbdd011a988aeba))
28+
* **automated:** Update icons 2024-10-18 ([00aeae9](https://github.com/ZebraDevs/zds-android/commit/00aeae93ce5acb61acf2127f2615ab40f6be91da))
29+
* 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))
30+
31+
32+
### 🧹 Miscellaneous Chores
33+
34+
* Add version to example app ([4e05e08](https://github.com/ZebraDevs/zds-android/commit/4e05e086135cf9cd557903bcf68265ce1dc75893))
35+
* Organise / clean code using Android studio built in tools ([445100e](https://github.com/ZebraDevs/zds-android/commit/445100e9ad9f4a6a63f16f14a5f053bb73bbf1ac))
36+
* Remove unnecessary icons from example app ([4e05e08](https://github.com/ZebraDevs/zds-android/commit/4e05e086135cf9cd557903bcf68265ce1dc75893))

README.md

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Once logged in with SSO, select your username in the top right corner, and selec
1717
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.
1818

1919
```gradle
20-
artifactusername=XXX
21-
artifactpassword=YYY
20+
mavenUsername=XXX
21+
mavenPassword=YYY
2222
```
2323

2424
These credentials should **_never_** be shared.
@@ -38,8 +38,8 @@ dependencyResolutionManagement {
3838
maven{
3939
url "https://artifactory-us.zebra.com/artifactory/dmo-mvn-rel/"
4040
credentials {
41-
username = "${artifactusername}"
42-
password = "${artifactpassword}"
41+
username = "${mavenUsername}"
42+
password = "${mavenPassword}"
4343
}
4444
}
4545
}
@@ -64,8 +64,8 @@ dependencyResolutionManagement {
6464
maven{
6565
url = uri("https://artifactory-us.zebra.com/artifactory/dmo-mvn-rel/")
6666
credentials {
67-
username = getProperty("artifactoryusername")
68-
password = getProperty("artifactorypassword")
67+
username = getProperty("mavenUsername")
68+
password = getProperty("mavenPassword")
6969
}
7070
}
7171
}
@@ -74,7 +74,11 @@ dependencyResolutionManagement {
7474

7575
</details>
7676

77-
### 4. Add dependency to app build file
77+
### 4. Run gradle build
78+
79+
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).
80+
81+
### 5. Add dependency to app build file
7882

7983
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`
8084

@@ -85,7 +89,7 @@ This file should be located within the app directory of your project (not the ro
8589
```
8690
dependencies {
8791
...
88-
implementation 'com.zebra:zds:1.0.0'
92+
implementation 'com.zebra:zds:1.1.0'
8993
}
9094
```
9195

@@ -96,17 +100,25 @@ dependencies {
96100

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

103+
dependencies {
104+
...
105+
implementation("com.zebra:zds:1.1.0")
106+
}
107+
108+
<!-- x-release-please-end -->
109+
110+
Once you have done this, and performed a sync and build, the IDE _should_ recommend this line be refactored into the new style below:
111+
99112
```
100113
dependencies {
101114
...
102115
implementation(libs.zds)
103116
}
104117
```
105118

106-
<!-- x-release-please-end -->
107119
</details>
108120

109-
### 5. Add theme to manifest
121+
### 6. Add theme to manifest
110122

111123
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.
112124

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

121-
### 6. Use components
133+
### 7. Use components
122134

123135
```xml
124136
<com.zebra.zds.ZdsButton

app/src/main/java/com/zebra/zdsDemo/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public void onDrawerOpened(@NonNull View drawerView) {
162162
((TextView) navView.getHeaderView(0).findViewById(R.id.title)).setText("Title");
163163
((TextView) navView.getHeaderView(0).findViewById(R.id.subtitle)).setText("Subtitle");
164164
// x-release-please-start-version
165-
((TextView) findViewById(R.id.footer_subtitle)).setText("ZDS Android v1.0.0");
165+
((TextView) findViewById(R.id.footer_subtitle)).setText("ZDS Android v1.1.0");
166166
// x-release-please-end
167167
((AppCompatImageView) navView.getHeaderView(0).findViewById(R.id.image)).setImageResource(R.drawable.ic_happy_round);
168168
((AppCompatImageView) navView.getHeaderView(0).findViewById(R.id.image)).setImageTintList(ColorStateList.valueOf(Color.WHITE));

components/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ publishing {
4444
groupId = 'com.zebra'
4545
artifactId = 'zds'
4646
// x-release-please-start-version
47-
version = '1.0.0'
47+
version = '1.1.0'
4848
// x-release-please-end
4949

5050
afterEvaluate {
@@ -60,8 +60,8 @@ publishing {
6060
repositories {
6161
maven {
6262
credentials {
63-
username = project.property('artifactoryusername')
64-
password = project.property('artifactorypassword')
63+
username = project.property('mavenUsername')
64+
password = project.property('mavenPassword')
6565
}
6666
url = project.property('zds-android-maven') + project.property('publish')
6767
}

components/proguard-rules.pro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@
1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
2121
#-renamesourcefileattribute SourceFile
22+
-dontwarn java.lang.invoke.LambdaMetafactory

0 commit comments

Comments
 (0)