Merge pull request #3 from wiryadev/main

Dependency Version Upgrade
Gurupreet · Jun 26, 2021 · 73000da · 73000da
2 parents 44cf0ac + f31da4e
commit 73000da
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/FontAwesomeComposeLib/build.gradle b/FontAwesomeComposeLib/build.gradle
@@ -59,7 +59,7 @@ dependencies {
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.ui:ui-tooling:$compose_version"
     implementation "androidx.compose.foundation:foundation:$compose_version"
-    testImplementation 'junit:junit:4.+'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
diff --git a/app/build.gradle b/app/build.gradle
@@ -41,15 +41,15 @@ android {
 
 dependencies {
     implementation project(':FontAwesomeComposeLib')
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'androidx.core:core-ktx:1.5.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'com.google.android.material:material:1.3.0'
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.material:material:$compose_version"
     implementation "androidx.compose.ui:ui-tooling:$compose_version"
-    implementation "androidx.activity:activity-compose:1.3.0-alpha03"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0'
-    testImplementation 'junit:junit:4.+'
+    implementation "androidx.activity:activity-compose:1.3.0-beta02"
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
diff --git a/app/src/main/java/com/guru/fontawesomecompose/helper/GenerateIconsHelper.kt b/app/src/main/java/com/guru/fontawesomecompose/helper/GenerateIconsHelper.kt
@@ -10,6 +10,7 @@ import java.io.BufferedReader
 import java.io.IOException
 import java.io.InputStreamReader
 import java.net.URL
+import java.util.*
 
 object GenerateIconsHelper {
 
@@ -42,7 +43,7 @@ internal fun URL.readStream(): String? {
     }
 }
 
-suspend fun parseJson(iconsContent: String): List<Any>? {
+suspend fun parseJson(iconsContent: String): List<Any> {
     val list = mutableListOf<Any>()
     val iconUrlPrefix = "https://fontawesome.com/icons/"
     try {
@@ -95,11 +96,13 @@ fun modifyNameCasing(name: String): String {
         val subNames = name.split("-")
         val newName = StringBuilder()
         subNames.forEach {
-            newName.append(it.capitalize())
+            newName.append(it.replaceFirstChar { char ->
+                if (char.isLowerCase()) char.titlecase(Locale.getDefault()) else char.toString()
+            })
         }
 
         return newName.toString()
     }
 
-    return name.capitalize()
+    return name.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }
 }
diff --git a/build.gradle b/build.gradle
@@ -1,15 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        compose_version = '1.0.0-beta07'
-        kotlin_version = "1.4.32"
+        compose_version = '1.0.0-beta09'
+        kotlin_version = "1.5.10"
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0-beta06'
+        classpath 'com.android.tools.build:gradle:7.1.0-alpha02'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -19,9 +19,8 @@ buildscript {
 
 allprojects {
     repositories {
-        mavenLocal()
+        mavenCentral()
         google()
-        jcenter()
         maven { url 'https://jitpack.io' }
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Mar 08 00:34:47 SGT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME