diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml index 7883acdf..5e1e29f0 100644 --- a/.github/workflows/core_tests.yml +++ b/.github/workflows/core_tests.yml @@ -9,17 +9,27 @@ on: jobs: test: - runs-on: macos-latest - + runs-on: ubuntu-latest + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: checkout - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: - java-version: 1.8 - - name: Navigation test - uses: ReactiveCircus/android-emulator-runner@v2.14.3 + distribution: 'jetbrains' + java-version: '17' + + - name: Enable KVM + 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 + + - name: Run core tests + uses: ReactiveCircus/android-emulator-runner@v2 with: api-level: 21 profile: pixel diff --git a/.github/workflows/navigation_tests.yml b/.github/workflows/navigation_tests.yml index 49cde426..d1e19a34 100644 --- a/.github/workflows/navigation_tests.yml +++ b/.github/workflows/navigation_tests.yml @@ -9,18 +9,28 @@ on: jobs: test: - runs-on: macos-latest - + runs-on: ubuntu-latest + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: checkout - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: - java-version: 1.8 + distribution: 'jetbrains' + java-version: '17' + + - name: Enable KVM + 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 + - name: Navigation test - uses: ReactiveCircus/android-emulator-runner@v2.14.3 + uses: ReactiveCircus/android-emulator-runner@v2 with: api-level: 21 profile: pixel - script: ./gradlew :navigation:connectedCheck --stacktrace \ No newline at end of file + script: ./gradlew :navigation:connectedCheck --stacktrace diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..347e252e --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Log/OS Files +*.log + +# Android Studio generated files and folders +captures/ +.externalNativeBuild/ +.cxx/ +*.apk +output.json + +# IntelliJ +*.iml +.idea/ +misc.xml +deploymentTargetDropDown.xml +render.experimental.xml + +# Keystore files +*.jks +*.keystore + +# Google Services (e.g. APIs or Firebase) +google-services.json + +# Android Profiling +*.hprof diff --git a/app/build.gradle b/app/build.gradle index 0a37e890..c3bf82ee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -103,7 +103,7 @@ dependencies { implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' implementation 'com.jakewharton.rx2:replaying-share-kotlin:2.2.0' - implementation 'me.everything:overscroll-decor-android:1.1.0' + implementation 'io.github.everythingme:overscroll-decor-android:1.1.1' implementation 'com.andkulikov:transitionseverywhere:2.1.0' implementation 'com.opencsv:opencsv:5.4' diff --git a/build.gradle b/build.gradle index 3ba46955..a5d171b1 100644 --- a/build.gradle +++ b/build.gradle @@ -3,14 +3,14 @@ import groovy.json.JsonSlurper // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.0' + ext.kotlin_version = '1.6.21' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.0' + classpath 'com.android.tools.build:gradle:7.3.0' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:2.0.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 691fb4cc..f805383e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip