Merge pull request #7 from invissvenska/develop

Develop
invissvenska · Apr 4, 2021 · 61188d5 · 61188d5
2 parents 70893ce + 751f24e
commit 61188d5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -23,9 +23,9 @@ android {
 }
 
 dependencies {
-    implementation "androidx.appcompat:appcompat:$androidXVersion"
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    testImplementation 'junit:junit:4.13.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/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -21,16 +21,13 @@ allprojects {
 }
 
 ext {
-    compileSdkVersion = 29
-    buildToolsVersion = '29.0.2'
+    compileSdkVersion = 30
+    buildToolsVersion = '29.0.3'
     minSdkVersion = 16
     targetSdkVersion = compileSdkVersion
 
-    androidXVersion = '1.1.1'
-    androidXLifeCycleVersion = '2.2.0'
-
-    versionCode = 3
-    versionName = '1.0.2'
+    versionCode = 4
+    versionName = '1.0.3'
 }
 
 task clean(type: Delete) {

diff --git a/numberpickerpreference/build.gradle b/numberpickerpreference/build.gradle
@@ -25,6 +25,6 @@ android {
 }
 
 dependencies {
-    api "androidx.lifecycle:lifecycle-extensions:$androidXLifeCycleVersion"
-    api "androidx.preference:preference:$androidXVersion"
+    api 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    api 'androidx.preference:preference:1.1.1'
 }