Merge pull request #20 from skydoves/cleanup/gradle

Cleanup Gradle & dependencies
skydoves · Dec 29, 2021 · 36e38ea · 36e38ea
2 parents c006f04 + 3c9ea79
commit 36e38ea
Show file tree

Hide file tree

Showing 36 changed files with 21 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -47,7 +47,6 @@ android {
 
 dependencies {
     implementation "com.google.android.material:material:$versions.googleMaterial"
-    implementation "androidx.constraintlayout:constraintlayout:$versions.constraintVersion"
     implementation "androidx.fragment:fragment-ktx:$versions.fragmentVersion"
 
     implementation "com.github.bumptech.glide:glide:$versions.glideVersion"

diff --git a/...com/skydoves/bindablesdemo/BindableApp.kt → ...com/skydoves/bindablesdemo/BindableApp.kt b/...com/skydoves/bindablesdemo/BindableApp.kt → ...com/skydoves/bindablesdemo/BindableApp.kt
diff --git a/...om/skydoves/bindablesdemo/MainActivity.kt → ...om/skydoves/bindablesdemo/MainActivity.kt b/...om/skydoves/bindablesdemo/MainActivity.kt → ...om/skydoves/bindablesdemo/MainActivity.kt
diff --git a/...m/skydoves/bindablesdemo/MainViewModel.kt → ...m/skydoves/bindablesdemo/MainViewModel.kt b/...m/skydoves/bindablesdemo/MainViewModel.kt → ...m/skydoves/bindablesdemo/MainViewModel.kt
diff --git a/...va/com/skydoves/bindablesdemo/MockUtil.kt → ...in/com/skydoves/bindablesdemo/MockUtil.kt b/...va/com/skydoves/bindablesdemo/MockUtil.kt → ...in/com/skydoves/bindablesdemo/MockUtil.kt
diff --git a/...dablesdemo/binding/RecyclerViewBinding.kt → ...dablesdemo/binding/RecyclerViewBinding.kt b/...dablesdemo/binding/RecyclerViewBinding.kt → ...dablesdemo/binding/RecyclerViewBinding.kt
diff --git a/...oves/bindablesdemo/binding/ViewBinding.kt → ...oves/bindablesdemo/binding/ViewBinding.kt b/...oves/bindablesdemo/binding/ViewBinding.kt → ...oves/bindablesdemo/binding/ViewBinding.kt
diff --git a/...s/bindablesdemo/fragments/HomeFragment.kt → ...s/bindablesdemo/fragments/HomeFragment.kt b/...s/bindablesdemo/fragments/HomeFragment.kt → ...s/bindablesdemo/fragments/HomeFragment.kt
diff --git a/...indablesdemo/fragments/LibraryFragment.kt → ...indablesdemo/fragments/LibraryFragment.kt b/...indablesdemo/fragments/LibraryFragment.kt → ...indablesdemo/fragments/LibraryFragment.kt
diff --git a/...ndablesdemo/fragments/MainPagerAdapter.kt → ...ndablesdemo/fragments/MainPagerAdapter.kt b/...ndablesdemo/fragments/MainPagerAdapter.kt → ...ndablesdemo/fragments/MainPagerAdapter.kt
diff --git a/.../bindablesdemo/fragments/RadioFragment.kt → .../bindablesdemo/fragments/RadioFragment.kt b/.../bindablesdemo/fragments/RadioFragment.kt → .../bindablesdemo/fragments/RadioFragment.kt
diff --git a/...skydoves/bindablesdemo/recycler/Poster.kt → ...skydoves/bindablesdemo/recycler/Poster.kt b/...skydoves/bindablesdemo/recycler/Poster.kt → ...skydoves/bindablesdemo/recycler/Poster.kt
diff --git a/...s/bindablesdemo/recycler/PosterAdapter.kt → ...s/bindablesdemo/recycler/PosterAdapter.kt b/...s/bindablesdemo/recycler/PosterAdapter.kt → ...s/bindablesdemo/recycler/PosterAdapter.kt
diff --git a/...ablesdemo/recycler/PosterCircleAdapter.kt → ...ablesdemo/recycler/PosterCircleAdapter.kt b/...ablesdemo/recycler/PosterCircleAdapter.kt → ...ablesdemo/recycler/PosterCircleAdapter.kt
diff --git a/.../bindablesdemo/recycler/PosterDiffUtil.kt → .../bindablesdemo/recycler/PosterDiffUtil.kt b/.../bindablesdemo/recycler/PosterDiffUtil.kt → .../bindablesdemo/recycler/PosterDiffUtil.kt
diff --git a/...ndablesdemo/recycler/PosterLineAdapter.kt → ...ndablesdemo/recycler/PosterLineAdapter.kt b/...ndablesdemo/recycler/PosterLineAdapter.kt → ...ndablesdemo/recycler/PosterLineAdapter.kt
diff --git a/bindables/build.gradle b/bindables/build.gradle
@@ -64,7 +64,6 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$versions.androidxAppcompat"
     api "androidx.lifecycle:lifecycle-viewmodel-ktx:$versions.lifecycleVersion"
     api "androidx.lifecycle:lifecycle-viewmodel-savedstate:$versions.lifecycleVersion"
-    api "androidx.recyclerview:recyclerview:$versions.recyclerView"
 }
 
 apply plugin: "com.vanniktech.maven.publish"

diff --git a/...com/skydoves/bindables/BindingActivity.kt → ...com/skydoves/bindables/BindingActivity.kt b/...com/skydoves/bindables/BindingActivity.kt → ...com/skydoves/bindables/BindingActivity.kt
diff --git a/...ables/BindingBottomSheetDialogFragment.kt → ...ables/BindingBottomSheetDialogFragment.kt b/...ables/BindingBottomSheetDialogFragment.kt → ...ables/BindingBottomSheetDialogFragment.kt
diff --git a/...ves/bindables/BindingComponentActivity.kt → ...ves/bindables/BindingComponentActivity.kt b/...ves/bindables/BindingComponentActivity.kt → ...ves/bindables/BindingComponentActivity.kt
diff --git a/...ydoves/bindables/BindingDialogFragment.kt → ...ydoves/bindables/BindingDialogFragment.kt b/...ydoves/bindables/BindingDialogFragment.kt → ...ydoves/bindables/BindingDialogFragment.kt
diff --git a/...m/skydoves/bindables/BindingExtensions.kt → ...m/skydoves/bindables/BindingExtensions.kt b/...m/skydoves/bindables/BindingExtensions.kt → ...m/skydoves/bindables/BindingExtensions.kt
diff --git a/...com/skydoves/bindables/BindingFragment.kt → ...com/skydoves/bindables/BindingFragment.kt b/...com/skydoves/bindables/BindingFragment.kt → ...com/skydoves/bindables/BindingFragment.kt
diff --git a/...oves/bindables/BindingFragmentActivity.kt → ...oves/bindables/BindingFragmentActivity.kt b/...oves/bindables/BindingFragmentActivity.kt → ...oves/bindables/BindingFragmentActivity.kt
diff --git a/...skydoves/bindables/BindingInitProvider.kt → ...skydoves/bindables/BindingInitProvider.kt b/...skydoves/bindables/BindingInitProvider.kt → ...skydoves/bindables/BindingInitProvider.kt
diff --git a/.../skydoves/bindables/BindingListAdapter.kt → .../skydoves/bindables/BindingListAdapter.kt b/.../skydoves/bindables/BindingListAdapter.kt → .../skydoves/bindables/BindingListAdapter.kt
diff --git a/.../com/skydoves/bindables/BindingManager.kt → .../com/skydoves/bindables/BindingManager.kt b/.../com/skydoves/bindables/BindingManager.kt → .../com/skydoves/bindables/BindingManager.kt
@@ -73,11 +73,11 @@ public object BindingManager {
       it.getter.hasAnnotation<Bindable>()
     }
       ?: throw IllegalArgumentException("KProperty: ${property.name} must be annotated with the `@Bindable` annotation on the getter.")
-    val propertyName = bindingProperty.name.decapitalize(Locale.ENGLISH)
+    val propertyName = bindingProperty.name.replaceFirstChar { it.lowercase(Locale.ENGLISH) }
     val bindingPropertyName = propertyName
       .takeIf { it.startsWith(JAVA_BEANS_BOOLEAN) }
       ?.replaceFirst(JAVA_BEANS_BOOLEAN, String())
-      ?.decapitalize(Locale.ENGLISH) ?: propertyName
+      ?.replaceFirstChar { it.lowercase(Locale.ENGLISH) } ?: propertyName
     return bindingFieldsMap[bindingPropertyName] ?: BR._all
   }
 
@@ -91,13 +91,22 @@ public object BindingManager {
       it.hasAnnotation<Bindable>()
     }
       ?: throw IllegalArgumentException("KFunction: ${function.name} must be annotated with the `@Bindable` annotation.")
-    val functionName = bindingFunction.name.decapitalize(Locale.ENGLISH)
+    val functionName = bindingFunction.name.replaceFirstChar { it.lowercase(Locale.ENGLISH) }
     val bindingFunctionName = when {
-      functionName.startsWith(JAVA_BEANS_GETTER) -> functionName.replaceFirst(JAVA_BEANS_GETTER, String())
-      functionName.startsWith(JAVA_BEANS_SETTER) -> functionName.replaceFirst(JAVA_BEANS_SETTER, String())
-      functionName.startsWith(JAVA_BEANS_BOOLEAN) -> functionName.replaceFirst(JAVA_BEANS_BOOLEAN, String())
+      functionName.startsWith(JAVA_BEANS_GETTER) -> functionName.replaceFirst(
+        JAVA_BEANS_GETTER,
+        String()
+      )
+      functionName.startsWith(JAVA_BEANS_SETTER) -> functionName.replaceFirst(
+        JAVA_BEANS_SETTER,
+        String()
+      )
+      functionName.startsWith(JAVA_BEANS_BOOLEAN) -> functionName.replaceFirst(
+        JAVA_BEANS_BOOLEAN,
+        String()
+      )
       else -> throw IllegalArgumentException("@Bindable associated with method must follow JavaBeans convention $functionName")
-    }.decapitalize(Locale.ENGLISH)
+    }.replaceFirstChar { it.lowercase(Locale.ENGLISH) }
     return bindingFieldsMap[bindingFunctionName] ?: BR._all
   }
 }
diff --git a/...va/com/skydoves/bindables/BindingModel.kt → ...in/com/skydoves/bindables/BindingModel.kt b/...va/com/skydoves/bindables/BindingModel.kt → ...in/com/skydoves/bindables/BindingModel.kt
diff --git a/...m/skydoves/bindables/BindingObservable.kt → ...m/skydoves/bindables/BindingObservable.kt b/...m/skydoves/bindables/BindingObservable.kt → ...m/skydoves/bindables/BindingObservable.kt
diff --git a/...ava/com/skydoves/bindables/BindingOnly.kt → ...lin/com/skydoves/bindables/BindingOnly.kt b/...ava/com/skydoves/bindables/BindingOnly.kt → ...lin/com/skydoves/bindables/BindingOnly.kt
diff --git a/...com/skydoves/bindables/BindingProperty.kt → ...com/skydoves/bindables/BindingProperty.kt b/...com/skydoves/bindables/BindingProperty.kt → ...com/skydoves/bindables/BindingProperty.kt
diff --git a/...oves/bindables/BindingPropertyDelegate.kt → ...oves/bindables/BindingPropertyDelegate.kt b/...oves/bindables/BindingPropertyDelegate.kt → ...oves/bindables/BindingPropertyDelegate.kt
diff --git a/...s/bindables/BindingRecyclerViewAdapter.kt → ...s/bindables/BindingRecyclerViewAdapter.kt b/...s/bindables/BindingRecyclerViewAdapter.kt → ...s/bindables/BindingRecyclerViewAdapter.kt
diff --git a/...om/skydoves/bindables/BindingViewModel.kt → ...om/skydoves/bindables/BindingViewModel.kt b/...om/skydoves/bindables/BindingViewModel.kt → ...om/skydoves/bindables/BindingViewModel.kt
diff --git a/...skydoves/bindables/FlowBindingProperty.kt → ...skydoves/bindables/FlowBindingProperty.kt b/...skydoves/bindables/FlowBindingProperty.kt → ...skydoves/bindables/FlowBindingProperty.kt
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -20,22 +20,20 @@ ext.versions = [
     versionName      : '1.0.9',
 
     gradleBuildTool  : '7.0.2',
-    spotlessGradle   : '5.15.0',
+    spotlessGradle   : '6.1.0',
     ktlintGradle     : '0.41.0',
     dokkaGradle      : '1.4.32',
     binaryValidator  : '0.7.1',
     mavenPublish     : '0.15.1',
 
-    kotlin           : '1.5.10',
-    androidxAppcompat: '1.4.0-alpha03',
+    kotlin           : '1.5.32',
+    androidxAppcompat: '1.4.0',
     googleMaterial   : '1.4.0',
-    lifecycleVersion : '2.3.1',
-    recyclerView     : '1.2.1',
+    lifecycleVersion : '2.4.0',
 
     // for demo
-    constraintVersion: '2.0.4',
     fragmentVersion  : '1.2.5',
-    hiltCoreVersion  : '2.38.1',
+    hiltCoreVersion  : '2.40.5',
     hiltVersion      : '1.0.0',
     glideVersion     : '4.12.0',
     whatIfVersion    : '1.1.0',