Merge branch 'master' into dependabot/gradle/org.mockito-mockito-core…

…-5.7.0
ligi · Oct 25, 2024 · 1157190 · 1157190
2 parents 886c6bf + a17b75c
commit 1157190
Show file tree

Hide file tree

Showing 17 changed files with 5,148 additions and 20 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -0,0 +1,20 @@
+name: Linting
+
+on:
+  pull_request:
+
+jobs:
+  analyse:
+    name: Analyse
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - run: ./gradlew lint
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,43 @@
+#https://github.com/marketplace/actions/android-emulator-runner
+name: Test
+on:
+  pull_request:
+
+jobs:
+  test:
+    timeout-minutes: 45
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'adopt'
+          java-version: '17'
+
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+      
+      - uses: gradle/actions/setup-gradle@v3
+
+      - name: run tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          arch: x86_64
+          api-level: 34
+          script: ./gradlew connectedWithMapsWithAnalyticsForPlayDebugAndroidTest
+        env:
+          API_LEVEL: 34
+
+      - name: Archive
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: code-coverage-report
+          path: build/reports/androidTests/
+          retention-days: 7
+
diff --git a/android/build.gradle b/android/build.gradle
@@ -5,20 +5,19 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'de.mobilej.unmock'
 
 repositories {
-    jcenter()
     mavenCentral()
     google()
     maven { url 'https://www.jitpack.io' }
 }
 
 android {
 
-    compileSdkVersion 33
+    compileSdkVersion 35
 
     defaultConfig {
         versionCode 373
         versionName "3.7.3"
-        minSdkVersion 14
+        minSdkVersion 23
         targetSdkVersion 33
         applicationId "org.ligi.passandroid"
         namespace "org.ligi.passandroid"
@@ -90,6 +89,7 @@ android {
         warning 'MissingTranslation'
         warning 'InvalidPackage'
         disable "NullSafeMutableLiveData"
+	baseline file("lint-baseline.xml")
     }
 
     buildTypes {
@@ -106,15 +106,17 @@ android {
 
     buildFeatures {
         viewBinding true
+        buildConfig true
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
+    namespace 'org.ligi.passandroid'
 }
 
 dependencies {
@@ -180,7 +182,7 @@ dependencies {
     implementation 'com.larswerkman:HoloColorPicker:1.5'
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
 
-    implementation 'com.squareup.okio:okio:3.3.0'
+    implementation 'com.squareup.okio:okio:3.6.0'
 
     implementation 'com.squareup.moshi:moshi:1.15.0'
     kapt "com.squareup.moshi:moshi-kotlin-codegen:1.15.0"