Revamped to Compose and Bump to v4.0.0 (#37)

Author: delacrixmorgan

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## Version 4.0.0  *(XX/XX/2023)*
+
+- Revamped Number Keyboard to Compose #37
+
 ## Version 3.1.0  *(13/12/2022)*
 
 - Add text size attribute (thanks @gerynugrh)

README.md

@@ -25,7 +25,7 @@ Add the dependency:
 
 ```gradle
 dependencies {
-	compile 'com.github.davidmigloz:number-keyboard:3.1.0'
+	implementation 'com.github.davidmigloz:number-keyboard:4.0.0'
 }
 ```
 
@@ -111,7 +111,7 @@ Pull request are very appreciated.
 
 ## License
 
-Copyright (c) 2018 David Miguel Lozano
+Copyright (c) 2023 David Miguel Lozano
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

build.gradle

@@ -7,8 +7,8 @@ buildscript {
     }
     dependencies {
         apply from: 'dependencies.gradle'
-        classpath gradleDependencies.androidGradle
-        classpath gradleDependencies.kotlinGradle
+        classpath "com.android.tools.build:gradle:$androidGradle"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin"
     }
 }
 
@@ -19,6 +19,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register('clean', Delete) {
+    delete rootProject.layout.buildDirectory
 }

configurations.gradle

@@ -1,11 +1,11 @@
 ext {
-
-    javaVersion = JavaVersion.VERSION_1_8
+    javaVersion = JavaVersion.VERSION_18
+    jvmToolchainVersion = 18
 
     androidConfig = [
-            minSdkVersion    : 19,
-            targetSdkVersion : 33,
-            compileSdkVersion: 33
+            minSdkVersion    : 21,
+            targetSdkVersion : 34,
+            compileSdkVersion: 34
     ]
 
     /**

dependencies.gradle

@@ -1,62 +1,22 @@
 ext {
-
     //----------------------------------------------------------------------------------------------
     // Gradle Dependencies
     //----------------------------------------------------------------------------------------------
 
     // Android Plugin for Gradle : https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google | https://developer.android.com/studio/releases/gradle-plugin.html#updating-plugin
-    androidGradle = '7.3.1'
-    // Kotlin version : https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-gradle-plugin
-    kotlin = '1.7.22'
-
-    gradleDependencies = [
-            androidGradle: "com.android.tools.build:gradle:${androidGradle}",
-            kotlinGradle : "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin}",
-    ]
+    androidGradle = '8.1.2'
+    // Kotlin : https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-gradle-plugin
+    // Kotlin Compose Compatibility Map : https://developer.android.com/jetpack/androidx/releases/compose-kotlin
+    kotlin = '1.9.10'
+    // Compose Compiler : https://developer.android.com/jetpack/androidx/releases/compose-compiler
+    composeCompiler = '1.5.3'
 
     //----------------------------------------------------------------------------------------------
     // App Dependencies
     //----------------------------------------------------------------------------------------------
 
-    // AndroidX Core : https://mvnrepository.com/artifact/androidx.core/core | https://developer.android.com/jetpack/androidx/androidx-rn
-    androidXCore = "1.9.0"
-    // AppCompat : https://mvnrepository.com/artifact/androidx.appcompat/appcompat | https://developer.android.com/topic/libraries/support-library/packages#v7-appcompat
-    appcompat = '1.5.1'
-    // Android Annotations : https://mvnrepository.com/artifact/androidx.annotation/annotation?repo=google | https://developer.android.com/topic/libraries/support-library/packages#annotations
-    annotations = "1.5.0"
-    // ConstraintLayout : https://mvnrepository.com/artifact/androidx.constraintlayout/constraintlayout
-    constraintLayout = '2.1.4'
-
-    appDependencies = [
-            androidXCore    : "androidx.core:core:${androidXCore}",
-            appcompat       : "androidx.appcompat:appcompat:${appcompat}",
-            annotations     : "androidx.annotation:annotation:${annotations}",
-            constraintLayout: "androidx.constraintlayout:constraintlayout:${constraintLayout}",
-            kotlinStdlib    : "org.jetbrains.kotlin:kotlin-stdlib:${kotlin}",
-    ]
-
-    //----------------------------------------------------------------------------------------------
-    // Debug Dependencies
-    //----------------------------------------------------------------------------------------------
-
-    // Timber (logger) : https://mvnrepository.com/artifact/com.jakewharton.timber/timber | https://github.com/JakeWharton/timber
-    timber = '5.0.1'
-
-    debugDependencies = [
-            timber: "com.jakewharton.timber:timber:${timber}",
-    ]
-
-    //----------------------------------------------------------------------------------------------
-    // Test Dependencies
-    //----------------------------------------------------------------------------------------------
-
-    // JUnit (unit testing framework) : https://mvnrepository.com/artifact/junit/junit | http://junit.org/junit4/
-    junit = '4.13.2'
-    // Mockito (mocking framework) : https://mvnrepository.com/artifact/org.mockito/mockito-core | http://site.mockito.org/
-    mockito = '4.9.0'
-
-    testDependencies = [
-            junit  : "junit:junit:${junit}",
-            mockito: "org.mockito:mockito-core:${mockito}",
-    ]
+    // Compose Bill of Materials : https://mvnrepository.com/artifact/androidx.compose/compose-bom
+    composeBoM = "2023.10.01"
+    // Compose Navigation : https://developer.android.com/jetpack/compose/navigation
+    composeNav = '2.7.5'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip

lib/build.gradle

@@ -1,14 +1,32 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+}
 
-ext.versionMajor = 3 // API Changes, adding big new feature, redesign the App
-ext.versionMinor = 1 // New features in a backwards-compatible manner
-ext.versionPatch = 0 // Backwards-compatible bug fixes
-ext.versionClassifier = null // Pre-releases (alpha, beta, rc, SNAPSHOT...)
+ext {
+    versionMajor = 4 // API Changes, adding big new feature, redesign the App
+    versionMinor = 0 // New features in a backwards-compatible manner
+    versionPatch = 0 // Backwards-compatible bug fixes
+    versionClassifier = null // Pre-releases (alpha, beta, rc, SNAPSHOT...)
+}
 
 android {
+    namespace 'com.davidmiguel.numberkeyboard'
+
     compileSdkVersion androidConfig.compileSdkVersion
 
+    buildFeatures {
+        compose true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = composeCompiler
+    }
+
+    kotlin {
+        jvmToolchain(jvmToolchainVersion)
+    }
+
     defaultConfig {
         minSdkVersion androidConfig.minSdkVersion
         targetSdkVersion androidConfig.targetSdkVersion
@@ -22,9 +40,7 @@ android {
 }
 
 dependencies {
-    api appDependencies.constraintLayout
-    implementation appDependencies.androidXCore
-    implementation appDependencies.appcompat
-    implementation appDependencies.annotations
-    implementation appDependencies.kotlinStdlib
+    implementation platform("androidx.compose:compose-bom:$composeBoM")
+    implementation("androidx.compose.material3:material3")
+    implementation("androidx.compose.material:material-icons-extended")
 }