Use JDK 11 in GitHub Actions

.github/workflows/check_license.yml

@@ -3,9 +3,7 @@
 
 name: Check licenses
 
-on:
-  push:
-    branches: [ main ]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -14,10 +12,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: '11.0.8'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle

.github/workflows/lint.yml

@@ -1,10 +1,6 @@
 name: Lint
 
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -13,10 +9,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: set up JDK 1.8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: '11.0.8'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle

.github/workflows/tests.yml

@@ -1,10 +1,6 @@
 name: Run tests
 
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
+on: [push, pull_request]
 
 jobs:
   test:
@@ -12,6 +8,10 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: '11.0.8'
       - name: run tests
         uses: reactivecircus/android-emulator-runner@v2
         with:

app/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
     id("com.google.firebase.crashlytics")
     kotlin("android")
     kotlin("kapt")
-    id("com.cookpad.android.plugin.license-tools") version "1.2.5"
+    id("com.cookpad.android.plugin.license-tools") version "1.2.6"
     id("com.github.ben-manes.versions") version "0.36.0"
     id("com.vanniktech.android.junit.jacoco") version "0.16.0"
     id("dagger.hilt.android.plugin")
@@ -218,7 +218,8 @@ dependencies {
     implementation("androidx.compose.ui:ui:${Versions.compose}")
     implementation("androidx.compose.foundation:foundation:${Versions.compose}")
     implementation("androidx.compose.material:material:${Versions.compose}")
-    
+    releaseCompileOnly("androidx.compose.ui:ui-tooling:${Versions.compose}")
+
     googleplayImplementation("com.google.firebase:firebase-crashlytics:${Versions.crashlytics}")
     googleplayImplementation("com.google.firebase:firebase-analytics:${Versions.analytics}") {
         exclude("com.google.android.gms", "play-services-ads-identifier")

app/licenses.yml

@@ -916,3 +916,25 @@
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
   url: https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.0.0-beta01
+- artifact: androidx.compose.material:material:+
+  name: material
+  copyrightHolder: Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: https://developer.android.com/jetpack/androidx/releases/compose-material#1.0.0-beta01
+- artifact: androidx.compose.material:material-ripple:+
+  name: material-ripple
+  copyrightHolder: Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: https://developer.android.com/jetpack/androidx/releases/compose-material#1.0.0-beta01
+- artifact: androidx.compose.material:material-icons-core:+
+  name: material-icons-core
+  copyrightHolder: Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: https://developer.android.com/jetpack/androidx/releases/compose-material#1.0.0-beta01
+- artifact: androidx.compose.ui:ui-tooling:+
+  skip: true
+- artifact: androidx.compose.ui:ui-tooling-data:+
+  skip: true

app/src/main/assets/licenses.json

@@ -2187,6 +2187,48 @@
       "normalizedLicense": "apache2",
       "url": "https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.0.0-beta01",
       "libraryName": "foundation-layout"
+    },
+    {
+      "artifactId": {
+        "name": "material",
+        "group": "androidx.compose.material",
+        "version": "+"
+      },
+      "copyrightHolder": "Android Open Source Project",
+      "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.",
+      "license": "The Apache Software License, Version 2.0",
+      "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt",
+      "normalizedLicense": "apache2",
+      "url": "https://developer.android.com/jetpack/androidx/releases/compose-material#1.0.0-beta01",
+      "libraryName": "material"
+    },
+    {
+      "artifactId": {
+        "name": "material-ripple",
+        "group": "androidx.compose.material",
+        "version": "+"
+      },
+      "copyrightHolder": "Android Open Source Project",
+      "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.",
+      "license": "The Apache Software License, Version 2.0",
+      "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt",
+      "normalizedLicense": "apache2",
+      "url": "https://developer.android.com/jetpack/androidx/releases/compose-material#1.0.0-beta01",
+      "libraryName": "material-ripple"
+    },
+    {
+      "artifactId": {
+        "name": "material-icons-core",
+        "group": "androidx.compose.material",
+        "version": "+"
+      },
+      "copyrightHolder": "Android Open Source Project",
+      "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.",
+      "license": "The Apache Software License, Version 2.0",
+      "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt",
+      "normalizedLicense": "apache2",
+      "url": "https://developer.android.com/jetpack/androidx/releases/compose-material#1.0.0-beta01",
+      "libraryName": "material-icons-core"
     }
   ]
 }

deps_fdroid.txt

@@ -455,25 +455,44 @@
 +|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*)
 +|    +--- androidx.fragment:fragment:1.3.0 (*)
 +|    \--- androidx.appcompat:appcompat:1.3.0-beta01 (*)
-+\--- androidx.compose.foundation:foundation:1.0.0-beta01
-+     +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
-+     +--- androidx.compose.animation:animation:1.0.0-beta01
-+     |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
-+     |    +--- androidx.compose.animation:animation-core:1.0.0-beta01 (*)
-+     |    +--- androidx.compose.foundation:foundation-layout:1.0.0-beta01
-+     |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
-+     |    |    +--- androidx.compose.ui:ui:1.0.0-beta01 (*)
-+     |    |    +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*)
-+     |    |    +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*)
-+     |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30
-+     |    +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*)
+++--- androidx.compose.foundation:foundation:1.0.0-beta01
++|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
++|    +--- androidx.compose.animation:animation:1.0.0-beta01
++|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
++|    |    +--- androidx.compose.animation:animation-core:1.0.0-beta01 (*)
++|    |    +--- androidx.compose.foundation:foundation-layout:1.0.0-beta01
++|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
++|    |    |    +--- androidx.compose.ui:ui:1.0.0-beta01 (*)
++|    |    |    +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*)
++|    |    |    +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*)
++|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30
++|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*)
++|    |    +--- androidx.compose.ui:ui:1.0.0-beta01 (*)
++|    |    +--- androidx.compose.ui:ui-geometry:1.0.0-beta01 (*)
++|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*)
++|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30
++|    +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*)
++|    +--- androidx.compose.ui:ui:1.0.0-beta01 (*)
++|    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30
++|    +--- androidx.compose.foundation:foundation-layout:1.0.0-beta01 (*)
++|    +--- androidx.compose.ui:ui-text:1.0.0-beta01 (*)
++|    \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*)
++\--- androidx.compose.material:material:1.0.0-beta01
++     +--- androidx.compose.animation:animation-core:1.0.0-beta01 (*)
++     +--- androidx.compose.foundation:foundation:1.0.0-beta01 (*)
++     +--- androidx.compose.material:material-icons-core:1.0.0-beta01
 +     |    +--- androidx.compose.ui:ui:1.0.0-beta01 (*)
-+     |    +--- androidx.compose.ui:ui-geometry:1.0.0-beta01 (*)
-+     |    +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*)
-+     |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30
++     |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*)
++     +--- androidx.compose.material:material-ripple:1.0.0-beta01
++     |    +--- androidx.compose.foundation:foundation:1.0.0-beta01 (*)
++     |    +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*)
++     |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30
++     |    +--- androidx.compose.animation:animation:1.0.0-beta01 (*)
++     |    \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*)
 +     +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*)
 +     +--- androidx.compose.ui:ui:1.0.0-beta01 (*)
++     +--- androidx.compose.ui:ui-text:1.0.0-beta01 (*)
 +     +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30
++     +--- androidx.compose.animation:animation:1.0.0-beta01 (*)
 +     +--- androidx.compose.foundation:foundation-layout:1.0.0-beta01 (*)
-+     +--- androidx.compose.ui:ui-text:1.0.0-beta01 (*)
 +     \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*)

deps_googleplay.txt

@@ -569,25 +569,44 @@
 +|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*)
 +|    +--- androidx.fragment:fragment:1.3.0 (*)
 +|    \--- androidx.appcompat:appcompat:1.3.0-beta01 (*)
-+\--- androidx.compose.foundation:foundation:1.0.0-beta01
-+     +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
-+     +--- androidx.compose.animation:animation:1.0.0-beta01
-+     |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
-+     |    +--- androidx.compose.animation:animation-core:1.0.0-beta01 (*)
-+     |    +--- androidx.compose.foundation:foundation-layout:1.0.0-beta01
-+     |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
-+     |    |    +--- androidx.compose.ui:ui:1.0.0-beta01 (*)
-+     |    |    +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*)
-+     |    |    +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*)
-+     |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30
-+     |    +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*)
+++--- androidx.compose.foundation:foundation:1.0.0-beta01
++|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
++|    +--- androidx.compose.animation:animation:1.0.0-beta01
++|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
++|    |    +--- androidx.compose.animation:animation-core:1.0.0-beta01 (*)
++|    |    +--- androidx.compose.foundation:foundation-layout:1.0.0-beta01
++|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
++|    |    |    +--- androidx.compose.ui:ui:1.0.0-beta01 (*)
++|    |    |    +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*)
++|    |    |    +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*)
++|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30
++|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*)
++|    |    +--- androidx.compose.ui:ui:1.0.0-beta01 (*)
++|    |    +--- androidx.compose.ui:ui-geometry:1.0.0-beta01 (*)
++|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*)
++|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30
++|    +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*)
++|    +--- androidx.compose.ui:ui:1.0.0-beta01 (*)
++|    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30
++|    +--- androidx.compose.foundation:foundation-layout:1.0.0-beta01 (*)
++|    +--- androidx.compose.ui:ui-text:1.0.0-beta01 (*)
++|    \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*)
++\--- androidx.compose.material:material:1.0.0-beta01
++     +--- androidx.compose.animation:animation-core:1.0.0-beta01 (*)
++     +--- androidx.compose.foundation:foundation:1.0.0-beta01 (*)
++     +--- androidx.compose.material:material-icons-core:1.0.0-beta01
 +     |    +--- androidx.compose.ui:ui:1.0.0-beta01 (*)
-+     |    +--- androidx.compose.ui:ui-geometry:1.0.0-beta01 (*)
-+     |    +--- androidx.compose.ui:ui-util:1.0.0-beta01 (*)
-+     |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30
++     |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*)
++     +--- androidx.compose.material:material-ripple:1.0.0-beta01
++     |    +--- androidx.compose.foundation:foundation:1.0.0-beta01 (*)
++     |    +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*)
++     |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30
++     |    +--- androidx.compose.animation:animation:1.0.0-beta01 (*)
++     |    \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*)
 +     +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*)
 +     +--- androidx.compose.ui:ui:1.0.0-beta01 (*)
++     +--- androidx.compose.ui:ui-text:1.0.0-beta01 (*)
 +     +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30
++     +--- androidx.compose.animation:animation:1.0.0-beta01 (*)
 +     +--- androidx.compose.foundation:foundation-layout:1.0.0-beta01 (*)
-+     +--- androidx.compose.ui:ui-text:1.0.0-beta01 (*)
 +     \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*)