Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to AGP 8 & Kotlin 1.9.10 #324

Merged
merged 18 commits into from
Jan 4, 2024
Merged

Upgrade to AGP 8 & Kotlin 1.9.10 #324

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0e994d6
Upgrade to AGP 8 & Kotlin 1.9.20
mattkranzler5 Dec 14, 2023
0d64a3d
Use java 17
mattkranzler5 Dec 14, 2023
3beae4f
Update jacoco version
mattkranzler5 Dec 14, 2023
7e057be
Fix namespace in stopwatch
mattkranzler5 Dec 14, 2023
7a9e9af
Update compose version & remove namespace from manifest files
mattkranzler5 Dec 14, 2023
476606a
Fix compilation errors, update mockito
mattkranzler5 Dec 14, 2023
639afdc
Update compile sdk to 33
mattkranzler5 Dec 14, 2023
2f0ddcc
Update compile sdk to 34
mattkranzler5 Dec 14, 2023
539d959
Update to latest versions of mockito
mattkranzler5 Dec 14, 2023
cbacdba
Fix for mockito test
mattkranzler5 Dec 14, 2023
543d07b
Fix test compilation error
mattkranzler5 Dec 14, 2023
e7980dc
Fix test compilation error
mattkranzler5 Dec 14, 2023
03d0061
Revert change with R namespace change, update robolectric
mattkranzler5 Dec 14, 2023
4b70922
Use kotlin 1.9.10 to match IC App
mattkranzler5 Dec 18, 2023
bbf0477
Revert to compose 1.5.3 which supports kotlin 1.9.10
mattkranzler5 Dec 18, 2023
8313672
Use jdk 18
mattkranzler5 Dec 21, 2023
2f04dff
Fix mockito.
Laimiux Jan 3, 2024
94bf9ae
Use java 18.
Laimiux Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .github/workflows/build-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ jobs:
env:
DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
steps:
- name: Configure JDK
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: 17
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if this should be java 18?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call, updated.

- name: Checkout the code
uses: actions/checkout@v2
- name: Install Ruby
Expand Down Expand Up @@ -42,6 +47,11 @@ jobs:
assemble_samples:
runs-on: ubuntu-latest
steps:
- name: Configure JDK
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: 17
- name: Checkout the code
uses: actions/checkout@v2
- name: Assemble Counter
Expand Down
67 changes: 65 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
import com.android.build.api.dsl.ApplicationExtension
import com.android.build.api.dsl.CommonExtension
import com.android.build.api.dsl.LibraryExtension
import com.android.build.api.dsl.TestExtension

buildscript {

repositories {
Expand All @@ -20,22 +25,79 @@ buildscript {
apply(plugin = "com.github.ben-manes.versions")
apply(plugin = "org.jetbrains.dokka")
apply(from = "gradle/jacoco.gradle")
apply(from = "gradle/merge-reports.gradle")

allprojects {
repositories {
google()
mavenCentral()
}
}

subprojects {
val javaVersion = JavaVersion.VERSION_11

tasks.withType<org.jetbrains.dokka.gradle.DokkaTaskPartial>().configureEach {
dokkaSourceSets.named("main") {
jdkVersion.set(8)
jdkVersion.set(11)
skipDeprecated.set(true)
skipEmptyPackages.set(true)
reportUndocumented.set(false)
}
}

// Common android config
val commonAndroidConfig: CommonExtension<*, *, *, *, *>.() -> Unit = {
compileSdk = 34

compileOptions {
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
}
}

// Android library config
pluginManager.withPlugin("com.android.library") {
with(extensions.getByType<LibraryExtension>()) {
commonAndroidConfig()
defaultConfig { minSdk = 21 }
}
}

// Android app config
pluginManager.withPlugin("com.android.application") {
with(extensions.getByType<ApplicationExtension>()) {
commonAndroidConfig()
defaultConfig {
minSdk = 21
//noinspection ExpiredTargetSdkVersion
targetSdk = 30
}
}
}

// Android test config
pluginManager.withPlugin("com.android.test") {
with(extensions.getByType<TestExtension>()) {
commonAndroidConfig()
defaultConfig {
// Using sdk 28 for robolectric tests.
minSdk = 28
//noinspection ExpiredTargetSdkVersion
targetSdk = 28
}
}
}

tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = javaVersion.toString()
targetCompatibility = javaVersion.toString()
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = javaVersion.toString()
}
}
}

tasks.register("clean", Delete::class) {
Expand All @@ -53,3 +115,4 @@ tasks.register("install") {
dependsOn(publishTasks)
}

apply(from = "gradle/merge-reports.gradle")
27 changes: 6 additions & 21 deletions formula-android-compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,17 @@ apply {
}

android {
compileSdk = libs.versions.compileSdk.get().toInt()

defaultConfig {
minSdk = libs.versions.minSdk.get().toInt()
targetSdk = libs.versions.targetSdk.get().toInt()
}
namespace = "com.instacart.formula.android.compose"

buildFeatures {
compose = true
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

composeOptions {
kotlinCompilerVersion = libs.versions.kotlin.get()
kotlinCompilerExtensionVersion = libs.versions.compose.get()
}
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
kotlinOptions {
jvmTarget = "1.8"
}
}

task<Jar>("sourcesJar") {
from(android.sourceSets["main"].java.srcDirs)
archiveClassifier.set("sources")
Expand All @@ -45,9 +28,11 @@ task<Jar>("sourcesJar") {
task<Javadoc>("javadoc") {
isFailOnError = false
source(android.sourceSets["main"].java.getSourceFiles())
classpath += project.files(android.bootClasspath.joinToString(separator = File.pathSeparator))
classpath += configurations.api
classpath += configurations.implementation
classpath = project.files(
android.bootClasspath.joinToString(separator = File.pathSeparator),
configurations.api,
configurations.implementation
)
}

task<Jar>("javadocJar") {
Expand Down
2 changes: 1 addition & 1 deletion formula-android-compose/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<manifest package="com.instacart.formula.android.compose"/>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>
2 changes: 1 addition & 1 deletion ...android-compose/src/main/java/com/instacart/formula/android/compose/ComposeViewFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import com.instacart.formula.android.ViewFactory
import com.jakewharton.rxrelay3.BehaviorRelay


abstract class ComposeViewFactory<RenderModel> : ViewFactory<RenderModel> {
abstract class ComposeViewFactory<RenderModel : Any> : ViewFactory<RenderModel> {

override fun create(inflater: LayoutInflater, container: ViewGroup?): FeatureView<RenderModel> {
val view = ComposeView(inflater.context)
Expand Down
15 changes: 1 addition & 14 deletions formula-android-tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,14 @@ apply {
}

android {
compileSdk = 28
namespace = "com.instacart.formula.samples"
defaultConfig {
applicationId = "com.instacart.formula.samples"
minSdk = libs.versions.minSdk.get().toInt()
targetSdk = 28 // Using sdk 28 for robolectric tests.
versionCode = 1
versionName = "1.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

buildTypes {
release {
isMinifyEnabled = false
Expand All @@ -38,12 +31,6 @@ android {
}
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
kotlinOptions {
jvmTarget = "1.8"
}
}

dependencies {
implementation(project(":formula-rxjava3"))
implementation(project(":formula-android"))
Expand Down
3 changes: 1 addition & 2 deletions formula-android-tests/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.instacart.formula">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application android:allowBackup="true"
android:label="@string/app_name"
Expand Down
28 changes: 7 additions & 21 deletions formula-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,13 @@ apply {
}

android {
compileSdk = libs.versions.compileSdk.get().toInt()

defaultConfig {
minSdk = libs.versions.minSdk.get().toInt()
targetSdk = libs.versions.targetSdk.get().toInt()
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
namespace = "com.instacart.formula.android"

testOptions {
unitTests.isReturnDefaultValues = true
}
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
kotlinOptions {
jvmTarget = "1.8"
}
}

task<Jar>("sourcesJar") {
from(android.sourceSets["main"].java.srcDirs)
archiveClassifier.set("sources")
Expand All @@ -42,9 +26,11 @@ task<Jar>("sourcesJar") {
task<Javadoc>("javadoc") {
isFailOnError = false
source(android.sourceSets["main"].java.getSourceFiles())
classpath += project.files(android.bootClasspath.joinToString(separator = File.pathSeparator))
classpath += configurations.api
classpath += configurations.implementation
classpath = project.files(
android.bootClasspath.joinToString(separator = File.pathSeparator),
configurations.api,
configurations.implementation
)
}

task<Jar>("javadocJar") {
Expand All @@ -70,7 +56,7 @@ dependencies {
testImplementation(libs.androidx.test.runner)
testImplementation(libs.espresso.core)
testImplementation(libs.truth)
testImplementation(libs.mockito.inline)
testImplementation(libs.mockito.core)
testImplementation(libs.mockito.kotlin)
testImplementation(libs.kotlin.reflect)
}
2 changes: 1 addition & 1 deletion formula-android/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<manifest package="com.instacart.formula.android"/>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>
9 changes: 5 additions & 4 deletions formula-android/src/test/java/com/instacart/formula/MockitoFormulaTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package com.instacart.formula

import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockito_kotlin.mock
import com.nhaarman.mockito_kotlin.spy
import com.nhaarman.mockito_kotlin.whenever
import org.junit.Test
import org.mockito.internal.stubbing.answers.CallsRealMethods
import org.mockito.kotlin.mock
import org.mockito.kotlin.whenever

class MockitoFormulaTest {

Expand All @@ -17,7 +16,9 @@ class MockitoFormulaTest {
assertThat(formula.type()).isEqualTo(MyFormula::class)
}

class MyFormula : StatelessFormula<Unit, Unit>() {
class MyFormula : Formula<Unit, Unit, Unit>() {
override fun initialState(input: Unit) = Unit

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Laimiux this test was failing due to an issue mocking MyFormula as a StatelessFormula:

Caused by: java.lang.reflect.MalformedParameterizedTypeException: Mismatch of count of formal and actual type arguments in constructor of com.instacart.formula.StatelessFormula$implementation$1: 0 formal argument(s) 2 actual argument(s)
	at java.base/sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl.validateConstructorArguments(Unknown Source)
	at java.base/sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl.<init>(Unknown Source)
	at java.base/sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl.make(Unknown Source)
	at java.base/sun.reflect.generics.factory.CoreReflectionFactory.makeParameterizedType(Unknown Source)
	at java.base/sun.reflect.generics.visitor.Reifier.visitClassTypeSignature(Unknown Source)
	at java.base/sun.reflect.generics.tree.ClassTypeSignature.accept(Unknown Source)
	at java.base/sun.reflect.generics.repository.FieldRepository.computeGenericType(Unknown Source)
	at java.base/sun.reflect.generics.repository.FieldRepository.getGenericType(Unknown Source)
	at java.base/java.lang.reflect.Field.getGenericType(Unknown Source)
	at net.bytebuddy.description.type.TypeDescription$Generic$LazyProjection$ForLoadedFieldType.resolve(TypeDescription.java:6685)
	at net.bytebuddy.description.type.TypeDescription$Generic$LazyProjection.accept(TypeDescription.java:6297)
	at net.bytebuddy.description.field.FieldDescription$AbstractBase.asToken(FieldDescription.java:200)
	at net.bytebuddy.description.field.FieldDescription$AbstractBase.asToken(FieldDescription.java:123)
	at net.bytebuddy.description.field.FieldList$AbstractBase.asTokenList(FieldList.java:64)
	at net.bytebuddy.dynamic.scaffold.InstrumentedType$Factory$Default$1.represent(InstrumentedType.java:436)
	at net.bytebuddy.ByteBuddy.redefine(ByteBuddy.java:886)
	at net.bytebuddy.ByteBuddy.redefine(ByteBuddy.java:861)
	at org.mockito.internal.creation.bytebuddy.InlineBytecodeGenerator.transform(InlineBytecodeGenerator.java:390)
	at java.instrument/java.lang.instrument.ClassFileTransformer.transform(Unknown Source)
	at java.instrument/sun.instrument.TransformerManager.transform(Unknown Source)
	at java.instrument/sun.instrument.InstrumentationImpl.transform(Unknown Source)
	at java.instrument/sun.instrument.InstrumentationImpl.retransformClasses0(Native Method)
	at java.instrument/sun.instrument.InstrumentationImpl.retransformClasses(Unknown Source)
	at org.mockito.internal.creation.bytebuddy.InlineBytecodeGenerator.triggerRetransformation(InlineBytecodeGenerator.java:281)
	... 58 more

I changed MyFormula to extend Formula as a workaround which seems ok based on what the actual test is trying to test.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suspect this test was added to ensure that mockFormula would continue to work in our codebase.

override fun Snapshot<Unit, Unit>.evaluate(): Evaluation<Unit> {
return Evaluation(Unit)
}
Expand Down
10 changes: 5 additions & 5 deletions formula-android/src/test/java/com/instacart/formula/android/ActivityStoreContextTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.Lifecycle
import com.instacart.formula.android.internal.ActivityStoreContextImpl
import com.jakewharton.rxrelay3.PublishRelay
import com.nhaarman.mockito_kotlin.mock
import com.nhaarman.mockito_kotlin.verify
import com.nhaarman.mockito_kotlin.verifyZeroInteractions
import com.nhaarman.mockito_kotlin.whenever
import io.reactivex.rxjava3.core.Observable
import kotlinx.parcelize.Parcelize
import org.junit.Before
import org.junit.Test
import org.mockito.kotlin.mock
import org.mockito.kotlin.verify
import org.mockito.kotlin.verifyNoInteractions
import org.mockito.kotlin.whenever

class ActivityStoreContextTest {
class FakeActivity : FragmentActivity() {
Expand Down Expand Up @@ -58,7 +58,7 @@ class ActivityStoreContextTest {
doSomething()
}

verifyZeroInteractions(activity)
verifyNoInteractions(activity)
}

@Test fun `send event success`() {
Expand Down
2 changes: 1 addition & 1 deletion formula-android/src/test/java/com/instacart/formula/android/ActivityStoreFactoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package com.instacart.formula.android
import androidx.fragment.app.FragmentActivity
import com.google.common.truth.Truth.assertThat
import com.instacart.formula.android.internal.ActivityStoreFactory
import com.nhaarman.mockito_kotlin.mock
import org.junit.Test
import org.mockito.kotlin.mock

class ActivityStoreFactoryTest {

Expand Down
11 changes: 0 additions & 11 deletions formula-coroutines/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@ plugins {
id("kotlin")
}

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

dependencies {
implementation(libs.kotlin)
implementation(libs.coroutines)
Expand All @@ -18,10 +13,4 @@ dependencies {
testImplementation(libs.truth)
testImplementation(libs.junit)
testImplementation(libs.coroutines.test)
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
kotlinOptions {
freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
}
}
5 changes: 0 additions & 5 deletions formula-lint/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ apply {
from("$rootDir/.buildscript/configure-signing.gradle")
}

java {
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_1_8
}

dependencies {
compileOnly(libs.lint.api)
compileOnly(libs.lint.checks)
Expand Down
Loading
Loading