Merge branch 'master' of https://git.frostnerd.com/AndroidUtils/baselibrarykt

.gitlab-ci.yml

@@ -3,21 +3,13 @@ image: thyrlian/android-sdk
 before_script:
   - chmod +x gradlew
 
-test:
+test-build-deploy:
   stage: test
   script:
-    - ./gradlew clean assembleRelease test --stacktrace || (find . -type d -wholename "**reports/tests" -exec zip -ru tests.zip {} \; && exit 1)
-    - find . -type d -wholename "**reports/tests" -exec zip -ru tests.zip {} \;
+    - ./gradlew clean assembleRelease sourcesJar javadocJar test --stacktrace
+    - ./gradlew publish --stacktrace
+  only:
+    - /^deploy.*$/
   except:
     - /^no_ci.*$/
-    - /^no_tests.*$/
-  artifacts:
-    when: always
-    paths:
-      - tests.zip
-
-deploy:
- stage: deploy
- script:
-  - ./gradlew clean assembleRelease sourcesJar javadocJar
-  - ./gradlew publish --stacktrace
\ No newline at end of file
+    - /^no_tests.*$/
\ No newline at end of file

build.gradle

@@ -24,13 +24,13 @@ ext.nexus_user = getNexusUser()
 ext.nexus_password = getNexusPassword()
 
 buildscript {
-    ext.ANDROID_COMPILE_SDK = (System.getenv("ANDROID_COMPILE_SDK") == null ? 29 : System.getenv("ANDROID_COMPILE_SDK")).toInteger()
+    ext.ANDROID_COMPILE_SDK = (System.getenv("ANDROID_COMPILE_SDK") == null ? 30 : System.getenv("ANDROID_COMPILE_SDK")).toInteger()
     ext.ANDROID_TARGET_SDK = (System.getenv("ANDROID_TARGET_SDK") == null ? ANDROID_COMPILE_SDK : System.getenv("ANDROID_TARGET_SDK")).toInteger()
     ext.ANDROID_MIN_SDK = (System.getenv("ANDROID_MIN_SDK") == null ? 21 : System.getenv("ANDROID_COMPILE_SDK")).toInteger()
-    ext.KOTLIN_VERSION = System.getenv("KOTLIN_VERSION") == null ? "1.4.10" : System.getenv("KOTLIN_VERSION")
-    ext.ANDROID_GRADLE_PLUGIN_VERSION = System.getenv("ANDROID_GRADLE_PLUGIN_VERSION") == null ? "4.0.1" : System.getenv("ANDROID_GRADLE_PLUGIN_VERSION")
+    ext.KOTLIN_VERSION = System.getenv("KOTLIN_VERSION") == null ? "1.4.21" : System.getenv("KOTLIN_VERSION")
+    ext.ANDROID_GRADLE_PLUGIN_VERSION = System.getenv("ANDROID_GRADLE_PLUGIN_VERSION") == null ? "4.1.1" : System.getenv("ANDROID_GRADLE_PLUGIN_VERSION")
     ext.APPCOMPAT_VERSION = "1.2.0"
-    ext.COROUTINE_VERSION = "1.3.9"
+    ext.COROUTINE_VERSION = "1.4.2"
     ext.RECYCLERVIEW_VERSION = "1.1.0"
     ext.ROBOELECTRIC_VERSION = "4.3"
 

library/build.gradle

@@ -64,10 +64,10 @@ dependencies {
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$COROUTINE_VERSION"
 
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.1'
     //testImplementation "org.robolectric:robolectric:$ROBOELECTRIC_VERSION"
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
 
 configurations.all {