Merge 6cc272e into 5effee0

.semaphore/deploy-beta.yml

@@ -3,10 +3,10 @@ name: Deployment Pipeline - Beta
 agent:
   machine:
     type: e1-standard-2
-    os_image: ubuntu1804
+    os_image: ubuntu2004
   containers:
     - name: main
-      image: 'registry.semaphoreci.com/android:29'
+      image: 'registry.semaphoreci.com/android:33'
 
 auto_cancel:
   running:

.semaphore/deploy-internal.yml

@@ -3,10 +3,10 @@ name: Deployment Pipeline - Internal
 agent:
   machine:
     type: e1-standard-2
-    os_image: ubuntu1804
+    os_image: ubuntu2004
   containers:
     - name: main
-      image: 'registry.semaphoreci.com/android:29'
+      image: 'registry.semaphoreci.com/android:33'
 
 auto_cancel:
   running:

.semaphore/semaphore.yml

@@ -3,10 +3,10 @@ name: Verification Pipeline
 agent:
   machine:
     type: e1-standard-2
-    os_image: ubuntu1804
+    os_image: ubuntu2004
   containers:
     - name: main
-      image: 'registry.semaphoreci.com/android:29'
+      image: 'registry.semaphoreci.com/android:33'
 
 auto_cancel:
   running:
@@ -34,7 +34,7 @@ blocks:
       jobs:
         - name: 'Build Project'
           commands:
-            - ./gradlew bundle
+            - ./gradlew bundle --stacktrace
       epilogue:
         on_pass:
           commands:
@@ -50,23 +50,23 @@ blocks:
       jobs:
         - name: 'Analyze Code'
           commands:
-            - ./gradlew lint
+            - ./gradlew lint --stacktrace
         - name: 'Unit Tests'
           commands:
-            - ./gradlew test
+            - ./gradlew test --stacktrace
         - name: 'Integration Tests'
           commands:
-            - sdkmanager "platform-tools" "platforms;android-29" "build-tools;30.0.0" "emulator"
-            - sdkmanager "system-images;android-29;google_apis;x86"
-            - echo no | avdmanager create avd -n test-emulator -k "system-images;android-29;google_apis;x86"
+            - sdkmanager "platform-tools" "platforms;android-33" "build-tools;33.0.2" "emulator"
+            - sdkmanager "system-images;android-33;google_apis;x86"
+            - echo no | avdmanager create avd -n test-emulator -k "system-images;android-33;google_apis;x86"
             - emulator -avd test-emulator -noaudio -no-boot-anim -gpu off -no-window &
             - adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done;'
             - adb shell wm dismiss-keyguard
             - sleep 1
             - adb shell settings put global window_animation_scale 0
             - adb shell settings put global transition_animation_scale 0
             - adb shell settings put global animator_duration_scale 0
-            - ./gradlew connectedAndroidTest
+            - ./gradlew connectedAndroidTest --stacktrace
       epilogue:
         always:
           commands:

app/build.gradle

@@ -4,13 +4,13 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.github.triplet.play'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.1"
+    compileSdkVersion 33
+    buildToolsVersion "33.0.2"
 
     defaultConfig {
         applicationId "com.semaphoreci.demo"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 33
 
         versionCode System.getenv("SEMAPHORE_WORKFLOW_NUMBER")?.toInteger() ?: 1
         versionName "1.0.${System.getenv("SEMAPHORE_WORKFLOW_NUMBER") ?: 0}"
@@ -96,7 +96,7 @@ dependencies {
     implementation 'com.github.haroldadmin:NetworkResponseAdapter:4.0.1'
 
     // Testing
-    def mockk_version = "1.10.0"
+    def mockk_version = "1.13.8"
     def core_testing_version = "1.2.0"
     def espresso_version = "3.2.0"
 

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.semaphoreci.demo">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -10,8 +11,11 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".ui.repolist.RepoListActivity">
+        android:theme="@style/AppTheme"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        tools:targetApi="s">
+        <activity android:name=".ui.repolist.RepoListActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/res/xml/data_extraction_rules.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+    <cloud-backup>
+
+    </cloud-backup>
+</data-extraction-rules>

build.gradle

@@ -1,14 +1,14 @@
 buildscript {
-    ext.kotlin_version = "1.3.72"
+    ext.kotlin_version = '1.9.10'
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url 'https://jitpack.io' }
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.triplet.gradle:play-publisher:2.8.0'
     }
@@ -17,11 +17,11 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url 'https://jitpack.io' }
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Mon Jul 20 17:08:54 WEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip