Merge pull request #119 from Spendesk/release/1.1.1

Release/1.1.1
Spendesk · Oct 11, 2022 · 22f7329 · 22f7329
2 parents da63895 + d796f0b
commit 22f7329
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -15,7 +15,7 @@ references:
       GRADLE_OPTS: -Dorg.gradle.daemon=false
 
   gradle_checksum_cache_key: &gradle_checksum_cache_key
-    key: gradle-{{ checksum "build.gradle" }}-{{ checksum "library/build.gradle" }}-{{ checksum "sample/build.gradle" }}-{{ checksum "gradle.properties" }}-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "settings.gradle" }}
+    key: gradle-{{ checksum "build.gradle" }}-{{ checksum "library/build.gradle" }}-{{ checksum "library-compose/build.gradle" }}-{{ checksum "sample/build.gradle" }}-{{ checksum "gradle.properties" }}-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "settings.gradle" }}
 
   # Branching
 

diff --git a/README.md b/README.md
@@ -33,9 +33,9 @@ allprojects {
 ```
 
 Add the dependency to your application module:
-
 ```bash
-implementation 'com.github.Spendesk:grapes-android:$grapes_version'
+implementation 'com.github.Spendesk.grapes-android:grapes-android:$grapes_version' // View only dependency
+implementation 'com.github.Spendesk.grapes-android:grapes-android-compose:$grapes_version' // Compose only dependency
 ```
 
 The latest Grapes version is: [![Grapes-Android](https://jitpack.io/v/Spendesk/grapes-android.svg)](https://jitpack.io/#Spendesk/grapes-android)
@@ -47,4 +47,4 @@ Please take a look at our [contributing](./CONTRIBUTING.md) guidelines if you're
 ## License
 
 Grapes-Android is released under the Apache-2.0 license.
-See [LICENSE](./LICENSE) for details.
+See [LICENSE](./LICENSE) for details.
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@
 buildscript {
 
     ext {
-        grapes_version = '1.1.0'
+        grapes_version = '1.1.1'
 
         kotlin_version = '1.7.10'
         firebase_app_distribution_version = '2.1.2'

diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Typography.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Typography.kt
@@ -36,47 +36,47 @@ data class GrapesTypography constructor(
     constructor(
         defaultFontFamily: FontFamily = DefaultGrapesFontFamily,
         bodyXs: TextStyle = TextStyle(
-            fontWeight = FontWeight.W300,
+            fontWeight = FontWeight.Normal,
             fontSize = 12.sp,
         ),
         bodyS: TextStyle = TextStyle(
-            fontWeight = FontWeight.W300,
+            fontWeight = FontWeight.Normal,
             fontSize = 14.sp,
         ),
         bodyRegular: TextStyle = TextStyle(
-            fontWeight = FontWeight.W300,
+            fontWeight = FontWeight.Normal,
             fontSize = 16.sp,
         ),
         bodyM: TextStyle = TextStyle(
-            fontWeight = FontWeight.W300,
+            fontWeight = FontWeight.Normal,
             fontSize = 24.sp,
         ),
         bodyL: TextStyle = TextStyle(
-            fontWeight = FontWeight.W300,
+            fontWeight = FontWeight.Normal,
             fontSize = 32.sp,
         ),
         bodyXl: TextStyle = TextStyle(
-            fontWeight = FontWeight.W300,
+            fontWeight = FontWeight.Normal,
             fontSize = 40.sp,
         ),
         bodyXxl: TextStyle = TextStyle(
-            fontWeight = FontWeight.W300,
+            fontWeight = FontWeight.Normal,
             fontSize = 56.sp,
         ),
         titleS: TextStyle = TextStyle(
-            fontWeight = FontWeight.W300,
+            fontWeight = FontWeight.Medium,
             fontSize = 14.sp,
         ),
         titleM: TextStyle = TextStyle(
-            fontWeight = FontWeight.W300,
+            fontWeight = FontWeight.Medium,
             fontSize = 16.sp,
         ),
         titleL: TextStyle = TextStyle(
-            fontWeight = FontWeight.W300,
+            fontWeight = FontWeight.Medium,
             fontSize = 18.sp,
         ),
         titleXl: TextStyle = TextStyle(
-            fontWeight = FontWeight.W300,
+            fontWeight = FontWeight.Medium,
             fontSize = 32.sp,
         ),
     ) : this(
@@ -98,4 +98,4 @@ internal val LocalGrapesTypography = staticCompositionLocalOf { GrapesTypography
 
 private fun TextStyle.withDefaultFontFamily(default: FontFamily): TextStyle {
     return if (fontFamily != null) this else copy(fontFamily = default)
-}
+}