Fix remaining errors

airbnb · Jul 30, 2023 · 590fce5 · 590fce5
1 parent 9cc30b2
commit 590fce5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -11,13 +11,21 @@ jobs:
     steps:
       - name: Checkout mavericks
         uses: actions/checkout@v2
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
       - name: Detekt
         run: "./gradlew detekt -PCI=true"
   lint:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout mavericks
         uses: actions/checkout@v2
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
       - name: Lint
         run: "./gradlew lintRelease"
   test-coverage:
@@ -26,6 +34,10 @@ jobs:
     steps:
       - name: Checkout mavericks
         uses: actions/checkout@v2
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
       - name: Unit Tests
         run: "./gradlew testReleaseUnitTest"
       - name: Code Coverage

diff --git a/mvrx/src/main/kotlin/com/airbnb/mvrx/MavericksViewModelProvider.kt b/mvrx/src/main/kotlin/com/airbnb/mvrx/MavericksViewModelProvider.kt
@@ -11,7 +11,6 @@ import java.io.Serializable
  * Helper ViewModelProvider that has a single method for taking either a [Fragment] or [ComponentActivity] instead
  * of two separate ones. The logic for providing the correct scope is inside the method.
  */
-@InternalMavericksApi
 object MavericksViewModelProvider {
     /**
      * Mavericks specific ViewModelProvider used for creating a BaseMavericksViewModel scoped to either a [Fragment] or [ComponentActivity].
@@ -28,6 +27,7 @@ object MavericksViewModelProvider {
      * @param initialStateFactory A way to specify how to create the initial state, can be mocked out for testing.
      *
      */
+    @InternalMavericksApi
     fun <VM : MavericksViewModel<S>, S : MavericksState> get(
         viewModelClass: Class<out VM>,
         stateClass: Class<out S>,

diff --git a/sample-anvilannotations/build.gradle b/sample-anvilannotations/build.gradle
@@ -1,5 +1,10 @@
 apply plugin: 'org.jetbrains.kotlin.jvm'
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
 dependencies {
     api 'javax.inject:javax.inject:1'
 }
diff --git a/sample-anvilcodegen/build.gradle b/sample-anvilcodegen/build.gradle
@@ -8,6 +8,11 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     }
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
 dependencies {
     api "com.squareup.anvil:compiler-api:2.4.6"
     implementation project(':sample-anvilannotations')