diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a24ab29a98..4ff8486c88 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -194,8 +194,8 @@ jobs: - name: Setup JDK uses: actions/setup-java@v3 with: - distribution: "zulu" - java-version: "11" + distribution: "temurin" + java-version: "17" - name: Cache Gradle uses: actions/cache@v2 @@ -370,4 +370,4 @@ jobs: - name: Run test run: | - npm run test \ No newline at end of file + npm run test diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 1fe2b87f93..a7712007e6 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -184,11 +184,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v2 with: - distribution: "zulu" - java-version: "11" + distribution: "temurin" + java-version: "17" # Cache the build process - name: Cache Gradle diff --git a/fe2-android/app/build.gradle b/fe2-android/app/build.gradle index 491ade362e..c628f44134 100644 --- a/fe2-android/app/build.gradle +++ b/fe2-android/app/build.gradle @@ -5,12 +5,12 @@ apply plugin: 'dagger.hilt.android.plugin' apply plugin: 'com.adarshr.test-logger' android { - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { applicationId "com.github.dedis.popstellar" minSdkVersion 26 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 1 versionName "1.0" @@ -215,17 +215,18 @@ task jacocoTestReport(type: JacocoReport, dependsOn: ['check']) { dependencies { // ============= Android Layout ============= - implementation 'com.google.android.material:material:1.6.1' + implementation 'com.google.android.material:material:1.9.0' implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'me.relex:circleindicator:2.1.6' - implementation "androidx.preference:preference:1.2.0" + implementation "androidx.preference:preference:1.2.1" implementation 'com.takisoft.preferencex:preferencex:1.1.0' // ================ Rx Java ================= implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' implementation 'io.reactivex.rxjava2:rxjava:2.2.21' // Converts Rx java to Livedata + // (Matteo Suez, 30.09.2023) Newer version than 2.5.1 makes the build fail implementation "androidx.lifecycle:lifecycle-reactivestreams:2.5.1" // ================= Hilt =================== @@ -244,15 +245,15 @@ dependencies { implementation 'ch.epfl.dedis:cothority:3.3.1' // ================= Json ================== - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.9.0' implementation 'com.networknt:json-schema-validator:1.0.72' // ================ QRCode ================= - def camerax_version = "1.2.1" + def camerax_version = "1.2.3" implementation 'com.google.android.gms:play-services-vision:20.1.3' implementation 'com.github.kenglxn.QRGen:android:2.6.0' - implementation 'com.google.mlkit:barcode-scanning:17.0.3' + implementation 'com.google.mlkit:barcode-scanning:17.2.0' implementation "androidx.camera:camera-core:${camerax_version}" implementation "androidx.camera:camera-camera2:${camerax_version}" implementation "androidx.camera:camera-lifecycle:${camerax_version}" @@ -292,16 +293,17 @@ dependencies { // ============= Test Framework ============ debugImplementation 'junit:junit:4.13.2' // Android framework + // (Matteo Suez, 30.09.2023) Newer version than 1.5.2 makes the build fail debugImplementation "androidx.fragment:fragment-testing:1.5.2" debugImplementation 'android.arch.core:core-testing:1.1.1' - debugImplementation 'androidx.test:core:1.4.0' - debugImplementation 'androidx.test:runner:1.4.0' - debugImplementation 'androidx.test:rules:1.4.0' - debugImplementation 'androidx.test.ext:junit:1.1.3' + debugImplementation 'androidx.test:core:1.5.0' + debugImplementation 'androidx.test:runner:1.5.2' + debugImplementation 'androidx.test:rules:1.5.0' + debugImplementation 'androidx.test.ext:junit:1.1.5' debugImplementation "androidx.test.espresso:espresso-core:$espresso_version" debugImplementation "com.android.support.test.espresso:espresso-contrib:$espresso_version" debugImplementation "androidx.test.espresso:espresso-intents:$espresso_version" - androidTestUtil 'androidx.test:orchestrator:1.4.1' + androidTestUtil 'androidx.test:orchestrator:1.4.2' // Robolectric testImplementation 'org.robolectric:robolectric:4.8' // Mockito diff --git a/fe2-android/build.gradle b/fe2-android/build.gradle index 2fc53a2608..fc29b1e130 100644 --- a/fe2-android/build.gradle +++ b/fe2-android/build.gradle @@ -3,9 +3,10 @@ buildscript { ext { // Write shared dependency versions here, they will be available in the whole project hilt_version = '2.42' - room_version = '2.4.3' + room_version = '2.5.2' scarlet_version = '0.1.11' slf4j_version = '1.7.36' + // (Matteo Suez, 30.09.2023) Newer version than 3.5.0-alpha07 makes the build fail espresso_version = '3.5.0-alpha07' } @@ -17,7 +18,7 @@ buildscript { } plugins { - id 'com.android.application' version '7.4.1' apply false + id 'com.android.application' version '7.4.2' apply false } task clean(type: Delete) { diff --git a/fe2-android/docs/README.md b/fe2-android/docs/README.md index 294d3ea813..c484005cb3 100644 --- a/fe2-android/docs/README.md +++ b/fe2-android/docs/README.md @@ -347,8 +347,7 @@ This project follows the [Google Java Style Guide](https://google.github.io/styl The [google-java-format](https://github.com/google/google-java-format) plugin allows very easy formatting. -Please ensure that you configure Android Studio to use `google-java-format`. As of now, v1.9 of the -plugin requires JDK11 which is not shipped with Android Studio 4.0. Please install the `Choose Runtime` plugin from the Marketplace and install a JDK11 runtime by double pressing shift and searching for `Choose Runtime` in the popup. +Please ensure that you configure Android Studio to use `google-java-format`. `google-java-format` does not handle import orders unfortunately. Please import the [google-style scheme](https://raw.githubusercontent.com/google/styleguide/gh-pages/intellij-java-google-style.xml) in Android Studio by going to `Preferences` -> `Editor` -> `Code Style` -> `Import Scheme...` on the