migrate Calculator to AndroidX

bestorman · Jul 7, 2019 · 7f6a0c6 · 7f6a0c6
1 parent d6feadd
commit 7f6a0c6
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 21 deletions.
diff --git a/Android/Calculator/StartUp.zip b/Android/Calculator/StartUp.zip
diff --git a/Android/Calculator/StartUp/.idea/caches/build_file_checksums.ser b/Android/Calculator/StartUp/.idea/caches/build_file_checksums.ser
diff --git a/Android/Calculator/StartUp/.idea/misc.xml b/Android/Calculator/StartUp/.idea/misc.xml
diff --git a/Android/Calculator/StartUp/.idea/modules.xml b/Android/Calculator/StartUp/.idea/modules.xml
diff --git a/Android/Calculator/StartUp/.idea/vcs.xml b/Android/Calculator/StartUp/.idea/vcs.xml
diff --git a/Android/Calculator/StartUp/app/build.gradle b/Android/Calculator/StartUp/app/build.gradle
@@ -2,15 +2,15 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 29
+    buildToolsVersion "29.0.0"
     defaultConfig {
         applicationId "com.hussein.calculator"
         minSdkVersion 17
-        targetSdkVersion 25
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -21,14 +21,12 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    testImplementation 'junit:junit:4.12'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {
     mavenCentral()

diff --git a/Android/Calculator/StartUp/app/src/main/java/com/hussein/startup/MainActivity.kt b/Android/Calculator/StartUp/app/src/main/java/com/hussein/startup/MainActivity.kt
@@ -1,9 +1,9 @@
 package com.hussein.startup
 
-import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.widget.Button
+import androidx.appcompat.app.AppCompatActivity
 import  kotlinx.android.synthetic.main.activity_main.*
 class MainActivity : AppCompatActivity() {
 
@@ -57,7 +57,7 @@ class MainActivity : AppCompatActivity() {
                 buClickValue+="."
             }
             buPlusMins.id->{
-                buClickValue= "-"+ buClickValue
+                buClickValue= "-$buClickValue"
             }
         }
         etShowNumber.setText(buClickValue)

diff --git a/Android/Calculator/StartUp/build.gradle b/Android/Calculator/StartUp/build.gradle
@@ -1,13 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.2-4'
+    ext.kotlin_version = '1.3.41'
     repositories {
         maven { url 'https://maven.google.com' }
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha3'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -18,6 +19,7 @@ allprojects {
     repositories {
         jcenter()
         maven { url 'https://maven.google.com' }
+        google()
     }
 }
 

diff --git a/Android/Calculator/StartUp/gradle.properties b/Android/Calculator/StartUp/gradle.properties
@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.

diff --git a/Android/Calculator/StartUp/gradle/wrapper/gradle-wrapper.properties b/Android/Calculator/StartUp/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun May 21 20:13:21 EDT 2017
+#Sun Jul 07 08:55:35 EDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-milestone-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip