From 1b3fb361f031a4d5b7e872f1059dc7f3fba8fda3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 24 Oct 2023 08:55:52 +0200 Subject: [PATCH 01/16] Update gradle plugin --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f8247d92..5c43d363 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -gradlePlugin = "7.3.1" +gradlePlugin = "8.1.2" kotlin = "1.7.20" nexusPublish = "1.1.0" nexusStaging = "0.22.0" From b4e9cac94dd47980f4cf4631b92d613f0425b174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 24 Oct 2023 08:56:34 +0200 Subject: [PATCH 02/16] Update kotlin --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5c43d363..e114b4a4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] gradlePlugin = "8.1.2" -kotlin = "1.7.20" +kotlin = "1.9.10" nexusPublish = "1.1.0" nexusStaging = "0.22.0" compose = "1.3.1" From c38d2c0011bd96cd048f34546baa81461eca4688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 24 Oct 2023 08:57:07 +0200 Subject: [PATCH 03/16] Update nexus publish --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e114b4a4..85ae85dc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] gradlePlugin = "8.1.2" kotlin = "1.9.10" -nexusPublish = "1.1.0" +nexusPublish = "1.3.0" nexusStaging = "0.22.0" compose = "1.3.1" composeCompiler = "1.3.2" From 0310f25986665eca87f08b2322cc43ff240539e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 24 Oct 2023 08:57:30 +0200 Subject: [PATCH 04/16] Update staging --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 85ae85dc..8c1aaea3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ gradlePlugin = "8.1.2" kotlin = "1.9.10" nexusPublish = "1.3.0" -nexusStaging = "0.22.0" +nexusStaging = "0.30.0" compose = "1.3.1" composeCompiler = "1.3.2" androidXAppCompat = "1.0.2" From 7739966e7cc3c1d67f12d1ed5e301415c4dc4e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 24 Oct 2023 08:58:36 +0200 Subject: [PATCH 05/16] Remove catalog preview --- gradle/wrapper/gradle-wrapper.properties | 6 +++--- settings.gradle.kts | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8c035d09..462b5e72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Dec 03 13:54:10 CET 2022 +#Tue Oct 24 08:58:04 CEST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index 7c523eda..e9f06c1f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,3 @@ -enableFeaturePreview("VERSION_CATALOGS") - pluginManagement { repositories { google() From 07c8c90cec402313a552fcdeff3b326f29cead5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 24 Oct 2023 09:06:17 +0200 Subject: [PATCH 06/16] Update publishing --- barista-compose/build.gradle.kts | 2 - barista/build.gradle.kts | 2 - build.gradle | 2 + sample/build.gradle.kts | 1 - scripts/publish-module.gradle | 106 +++++++++++++------------------ 5 files changed, 47 insertions(+), 66 deletions(-) diff --git a/barista-compose/build.gradle.kts b/barista-compose/build.gradle.kts index 9df6efeb..78748c29 100644 --- a/barista-compose/build.gradle.kts +++ b/barista-compose/build.gradle.kts @@ -5,8 +5,6 @@ plugins { apply(from = "../config/android-quality.gradle") -ext["PUBLISH_ARTIFACT_ID"] = "barista-compose" - apply(from = "${rootProject.projectDir}/scripts/publish-module.gradle") android { diff --git a/barista/build.gradle.kts b/barista/build.gradle.kts index 011ef094..6bbc9491 100644 --- a/barista/build.gradle.kts +++ b/barista/build.gradle.kts @@ -5,8 +5,6 @@ plugins { apply(from = "../config/android-quality.gradle") -ext["PUBLISH_ARTIFACT_ID"] = "barista" - apply(from = "${rootProject.projectDir}/scripts/publish-module.gradle") android { diff --git a/build.gradle b/build.gradle index 31cdedaf..c85d8c48 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,8 @@ buildscript { classpath libs.nexus.staging } } + +apply plugin: 'io.codearte.nexus-staging' apply plugin: 'io.github.gradle-nexus.publish-plugin' allprojects { diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index d265d4f8..5ccacd80 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -1,7 +1,6 @@ plugins { id("com.android.application") kotlin("android") - id("kotlin-android-extensions") } apply(from = "../config/android-quality.gradle") diff --git a/scripts/publish-module.gradle b/scripts/publish-module.gradle index 4592ce2a..eacd1f07 100644 --- a/scripts/publish-module.gradle +++ b/scripts/publish-module.gradle @@ -1,76 +1,60 @@ apply plugin: 'maven-publish' apply plugin: 'signing' +apply plugin: 'maven-publish' +apply plugin: 'signing' -task androidSourcesJar(type: Jar) { - archiveClassifier.set('sources') - if (project.plugins.findPlugin("com.android.library")) { - from android.sourceSets.main.java.srcDirs - from android.sourceSets.main.kotlin.srcDirs - } else { - from sourceSets.main.java.srcDirs - from sourceSets.main.kotlin.srcDirs +android { + publishing { + singleVariant("release") { + withSourcesJar() } -} - -task javadocJar(type: Jar) { - archiveClassifier.set('javadoc') -} - -artifacts { - archives androidSourcesJar - archives javadocJar + } } group = project.property("libGroup") version = project.property("libVersion") -afterEvaluate { - publishing { - publications { - release(MavenPublication) { - groupId project.property("libGroup") - artifactId PUBLISH_ARTIFACT_ID - version project.property("libVersion") - - if (project.plugins.findPlugin("com.android.library")) { - from components.release - } else { - artifact("$buildDir/libs/${project.getName()}-${version}.jar") - } +publishing { + publications { + release(MavenPublication) { + groupId project.property("libGroup") + artifactId project.project.getName() + version project.property("libVersion") - artifact androidSourcesJar - artifact javadocJar + afterEvaluate { + from components.release + } - pom { - name = project.project.getName() - description = 'Barista makes developing UI test faster, easier and more predictable. Built on top of Espresso, it provides a simple and discoverable API, removing most of the boilerplate and verbosity of common Espresso tasks. You and your Android team will write tests with no effort.' - url = 'https://github.com/AdevintaSpain/Barista' - licenses { - license { - name = 'Stream License' - url = 'https://github.com/AdevintaSpain/Barista/blob/master/LICENSE.md' - } - } - developers { - developer { - id = 'AdevintaSpain' - name = 'Adevinta Spain' - email = 'engineers@adevinta.com' - } - } - organization { - name = "Adevinta Spain" - url = "https://github.com/AdevintaSpain" - } - scm { - connection = 'scm:git:github.com/AdevintaSpain/Barista.git' - developerConnection = 'scm:git:ssh://github.com/AdevintaSpain/Barista.git' - url = 'https://github.com/AdevintaSpain/Barista/tree/master' - } - } - } + pom { + name = project.project.getName() + description = + 'Barista makes developing UI test faster, easier and more predictable. Built on top of Espresso, it provides a simple and discoverable API, removing most of the boilerplate and verbosity of common Espresso tasks. You and your Android team will write tests with no effort.' + url = 'https://github.com/AdevintaSpain/Barista' + licenses { + license { + name = 'Stream License' + url = 'https://github.com/AdevintaSpain/Barista/blob/master/LICENSE.md' + } + } + developers { + developer { + id = 'AdevintaSpain' + name = 'Adevinta Spain' + email = 'engineers@adevinta.com' + } + } + organization { + name = "Adevinta Spain" + url = "https://github.com/AdevintaSpain" + } + scm { + connection = 'scm:git:github.com/AdevintaSpain/Barista.git' + developerConnection = 'scm:git:ssh://github.com/AdevintaSpain/Barista.git' + url = 'https://github.com/AdevintaSpain/Barista/tree/master' } + } } + } } ext["signing.keyId"] = rootProject.ext["signing.keyId"] @@ -78,5 +62,5 @@ ext["signing.password"] = rootProject.ext["signing.password"] ext["signing.secretKeyRingFile"] = rootProject.ext["signing.secretKeyRingFile"] signing { - sign publishing.publications + sign publishing.publications } \ No newline at end of file From 6b70003bec31b0e434d15cee42a9575f7bbc0596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 24 Oct 2023 09:07:11 +0200 Subject: [PATCH 07/16] Update target to 34 --- barista-compose/build.gradle.kts | 4 ++-- barista/build.gradle.kts | 4 ++-- sample/build.gradle.kts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/barista-compose/build.gradle.kts b/barista-compose/build.gradle.kts index 78748c29..67ec36d1 100644 --- a/barista-compose/build.gradle.kts +++ b/barista-compose/build.gradle.kts @@ -8,11 +8,11 @@ apply(from = "../config/android-quality.gradle") apply(from = "${rootProject.projectDir}/scripts/publish-module.gradle") android { - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 21 - targetSdk = 33 + targetSdk = 34 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunnerArguments["clearPackageData"] = "true" diff --git a/barista/build.gradle.kts b/barista/build.gradle.kts index 6bbc9491..78160c4f 100644 --- a/barista/build.gradle.kts +++ b/barista/build.gradle.kts @@ -8,11 +8,11 @@ apply(from = "../config/android-quality.gradle") apply(from = "${rootProject.projectDir}/scripts/publish-module.gradle") android { - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 21 - targetSdk = 33 + targetSdk = 34 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } namespace = "com.adevinta.android.barista" diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 5ccacd80..6d52d6dc 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -6,11 +6,11 @@ plugins { apply(from = "../config/android-quality.gradle") android { - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 21 - targetSdk = 33 + targetSdk = 34 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunnerArguments["clearPackageData"] = "true" From b5444a668694630185cfac06b300d4162f2f1e01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 24 Oct 2023 09:08:57 +0200 Subject: [PATCH 08/16] Update java --- barista-compose/build.gradle.kts | 7 ++++++- barista/build.gradle.kts | 5 +++++ sample/build.gradle.kts | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/barista-compose/build.gradle.kts b/barista-compose/build.gradle.kts index 67ec36d1..e7e62553 100644 --- a/barista-compose/build.gradle.kts +++ b/barista-compose/build.gradle.kts @@ -26,7 +26,12 @@ android { kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() } - packagingOptions { + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } diff --git a/barista/build.gradle.kts b/barista/build.gradle.kts index 78160c4f..afaf913a 100644 --- a/barista/build.gradle.kts +++ b/barista/build.gradle.kts @@ -20,6 +20,11 @@ android { lint { disable.add("InvalidPackage") } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } } dependencies { diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 6d52d6dc..07eeff30 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -19,8 +19,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } testOptions { From 51994d79664fe79bae129fdbcadae0d871a03d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 24 Oct 2023 09:09:34 +0200 Subject: [PATCH 09/16] Update workflow to java 17 --- .github/workflows/main.yml | 8 ++++---- .github/workflows/publish.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 909a4a04..9fb99727 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,10 +20,10 @@ jobs: - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Build project run: ./gradlew assembleDebug @@ -42,10 +42,10 @@ jobs: - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Run instrumentation tests uses: ReactiveCircus/android-emulator-runner@v2.21.0 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 887b41c1..0f58ddec 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,10 +12,10 @@ jobs: steps: - name: Check out code uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 # Base64 decodes and pipes the GPG key content into the secret file - name: Prepare environment From aaf4e759f65d23daedaf1800c9cbf5de56729365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 24 Oct 2023 09:10:23 +0200 Subject: [PATCH 10/16] Update compose compiler --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8c1aaea3..cbffcdc5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ kotlin = "1.9.10" nexusPublish = "1.3.0" nexusStaging = "0.30.0" compose = "1.3.1" -composeCompiler = "1.3.2" +composeCompiler = "1.5.3" androidXAppCompat = "1.0.2" androidXAnnotation = "1.0.2" androidXCore = "1.0.1" From 0d7c16795c5fed78bc0d9e82c247f654df29b0c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 24 Oct 2023 09:12:53 +0200 Subject: [PATCH 11/16] Update ViewBinding --- sample/build.gradle.kts | 4 ++++ .../android/barista/sample/widget/SampleCustomView.kt | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 07eeff30..daf02c0f 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -18,6 +18,10 @@ android { vectorDrawables.useSupportLibrary = true } + buildFeatures { + viewBinding = true + } + compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 diff --git a/sample/src/main/java/com/adevinta/android/barista/sample/widget/SampleCustomView.kt b/sample/src/main/java/com/adevinta/android/barista/sample/widget/SampleCustomView.kt index f427b3b1..ab3d33d8 100644 --- a/sample/src/main/java/com/adevinta/android/barista/sample/widget/SampleCustomView.kt +++ b/sample/src/main/java/com/adevinta/android/barista/sample/widget/SampleCustomView.kt @@ -7,7 +7,7 @@ import android.view.LayoutInflater import android.widget.LinearLayout import androidx.core.content.withStyledAttributes import com.adevinta.android.barista.sample.R -import kotlinx.android.synthetic.main.sample_custom_view.view.customTextView +import com.adevinta.android.barista.sample.databinding.SampleCustomViewBinding class SampleCustomView @JvmOverloads constructor( @@ -32,7 +32,12 @@ constructor( LayoutInflater.from(context).inflate(R.layout.sample_custom_view, this, true) layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT) - customTextView.text = "Demo text" - customTextView.setTextColor(customColor) + val binding = SampleCustomViewBinding.inflate( + LayoutInflater.from(context), + this + ) + + binding.customTextView.text = "Demo text" + binding.customTextView.setTextColor(customColor) } } \ No newline at end of file From 07a716cbf233b5e4d83ef954dc4ac0f05d2c0150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 24 Oct 2023 09:16:21 +0200 Subject: [PATCH 12/16] Update ViewBinding --- .../android/barista/sample/CameraActivity.kt | 20 +++++++++++-------- .../android/barista/sample/ChipsActivity.kt | 10 +++++----- .../barista/sample/ViewPager2Activity.kt | 9 ++++++--- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/sample/src/main/java/com/adevinta/android/barista/sample/CameraActivity.kt b/sample/src/main/java/com/adevinta/android/barista/sample/CameraActivity.kt index c73caadd..ce471872 100644 --- a/sample/src/main/java/com/adevinta/android/barista/sample/CameraActivity.kt +++ b/sample/src/main/java/com/adevinta/android/barista/sample/CameraActivity.kt @@ -7,9 +7,8 @@ import android.os.Bundle import android.provider.MediaStore import androidx.appcompat.app.AppCompatActivity import androidx.core.content.FileProvider +import com.adevinta.android.barista.sample.databinding.ActivityCameraBinding import com.bumptech.glide.Glide -import kotlinx.android.synthetic.main.activity_camera.image_view -import kotlinx.android.synthetic.main.activity_camera.take_picture import java.io.File class CameraActivity : AppCompatActivity() { @@ -18,10 +17,13 @@ class CameraActivity : AppCompatActivity() { val TAKE_PICTURE_REQUEST_CODE = 42 } + private lateinit var binding: ActivityCameraBinding + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_camera) - take_picture.setOnClickListener { + binding = ActivityCameraBinding.inflate(layoutInflater) + setContentView(binding.root) + binding.takePicture.setOnClickListener { val uri = getPictureUri() val intent = Intent(MediaStore.ACTION_IMAGE_CAPTURE) intent.putExtra(MediaStore.EXTRA_OUTPUT, uri) @@ -33,14 +35,16 @@ class CameraActivity : AppCompatActivity() { @SuppressLint("MissingSuperCall") override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { if (requestCode == TAKE_PICTURE_REQUEST_CODE) { - Glide.with(this).load(getPictureUri()).into(image_view) + Glide.with(this).load(getPictureUri()).into(binding.imageView) } } private fun getPictureUri(): Uri { val path = applicationContext.cacheDir.path + "/test.jpg" - return FileProvider.getUriForFile(this, - applicationContext.packageName + ".barista.sample.provider", - File(path)) + return FileProvider.getUriForFile( + this, + applicationContext.packageName + ".barista.sample.provider", + File(path) + ) } } diff --git a/sample/src/main/java/com/adevinta/android/barista/sample/ChipsActivity.kt b/sample/src/main/java/com/adevinta/android/barista/sample/ChipsActivity.kt index 4e40e081..5b0625b1 100644 --- a/sample/src/main/java/com/adevinta/android/barista/sample/ChipsActivity.kt +++ b/sample/src/main/java/com/adevinta/android/barista/sample/ChipsActivity.kt @@ -3,17 +3,17 @@ package com.adevinta.android.barista.sample import android.os.Bundle import android.view.View import androidx.appcompat.app.AppCompatActivity -import kotlinx.android.synthetic.main.activity_chips.closeChip -import kotlinx.android.synthetic.main.activity_chips.closeChipText +import com.adevinta.android.barista.sample.databinding.ActivityChipsBinding class ChipsActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_chips) + val binding = ActivityChipsBinding.inflate(layoutInflater) + setContentView(binding.root) - closeChip.setOnCloseIconClickListener { - closeChipText.visibility = View.VISIBLE + binding.closeChip.setOnCloseIconClickListener { + binding.closeChipText.visibility = View.VISIBLE } } diff --git a/sample/src/main/java/com/adevinta/android/barista/sample/ViewPager2Activity.kt b/sample/src/main/java/com/adevinta/android/barista/sample/ViewPager2Activity.kt index 0b9ef0e5..16fcebb4 100644 --- a/sample/src/main/java/com/adevinta/android/barista/sample/ViewPager2Activity.kt +++ b/sample/src/main/java/com/adevinta/android/barista/sample/ViewPager2Activity.kt @@ -7,10 +7,12 @@ import androidx.viewpager2.adapter.FragmentStateAdapter import androidx.viewpager2.widget.ViewPager2 import com.adevinta.android.barista.sample.ViewPager2Activity.Orientation.HORIZONTAL import com.adevinta.android.barista.sample.ViewPager2Activity.Orientation.VERTICAL -import kotlinx.android.synthetic.main.activity_viewpager2.viewPager2 +import com.adevinta.android.barista.sample.databinding.ActivityViewpager2Binding class ViewPager2Activity : FragmentActivity() { + private lateinit var binding: ActivityViewpager2Binding + enum class Orientation { VERTICAL, HORIZONTAL @@ -18,9 +20,10 @@ class ViewPager2Activity : FragmentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding = ActivityViewpager2Binding.inflate(layoutInflater) setContentView(R.layout.activity_viewpager2) - viewPager2.adapter = ViewPager2Adapter(activity = this) + binding.viewPager2.adapter = ViewPager2Adapter(activity = this) } private class ViewPager2Adapter(activity: FragmentActivity) : FragmentStateAdapter(activity) { @@ -33,7 +36,7 @@ class ViewPager2Activity : FragmentActivity() { } fun set(orientation: Orientation) = runOnUiThread { - viewPager2.orientation = when (orientation) { + binding.viewPager2.orientation = when (orientation) { VERTICAL -> ViewPager2.ORIENTATION_VERTICAL HORIZONTAL -> ViewPager2.ORIENTATION_HORIZONTAL } From 518796b0c9bf4da3f72f38a7b26398bf192cb56c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 24 Oct 2023 09:17:41 +0200 Subject: [PATCH 13/16] Update R --- .../adevinta/android/barista/sample/ColorResourceTypeTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorResourceTypeTest.kt b/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorResourceTypeTest.kt index 7186a46e..501d0ecf 100644 --- a/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorResourceTypeTest.kt +++ b/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorResourceTypeTest.kt @@ -16,7 +16,7 @@ class ColorResourceTypeTest { @Test fun color_resource_type_color_attr() { - val type = R.attr.colorPrimary.colorResourceType + val type = com.google.android.material.R.attr.colorPrimary.colorResourceType assertEquals(type, ColorResourceType.COLOR_ATTR) } From a827472ed0b3600dbfcaadc041f20675e917d251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 24 Oct 2023 09:18:51 +0200 Subject: [PATCH 14/16] Update Rs --- .../com/adevinta/android/barista/sample/ColorsTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorsTest.java b/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorsTest.java index d928abde..342d37ce 100644 --- a/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorsTest.java +++ b/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorsTest.java @@ -31,8 +31,8 @@ public void checkColorList_whenDefault() { @Test public void checkColorAttribute() { - assertTextColorIs(R.id.textColorAttribute, R.attr.colorPrimary); - assertTextColorIsNot(R.id.textColorAttribute, R.attr.colorError); + assertTextColorIs(R.id.textColorAttribute, com.google.android.material.R.attr.colorPrimary); + assertTextColorIsNot(R.id.textColorAttribute, com.google.android.material.R.attr.colorError); } @Test @@ -84,7 +84,7 @@ public void checkSimpleColor_fails() { @Test(expected = BaristaException.class) public void checkColorAttr_fails() { - assertTextColorIs(R.id.textColorAttribute, R.attr.colorError); + assertTextColorIs(R.id.textColorAttribute, com.google.android.material.R.attr.colorError); } @Test(expected = BaristaException.class) @@ -99,7 +99,7 @@ public void checkNotSimpleColor_fails() { @Test(expected = BaristaException.class) public void checkNotColorAttr_fails() { - assertTextColorIsNot(R.id.textColorAttribute, R.attr.colorPrimary); + assertTextColorIsNot(R.id.textColorAttribute, com.google.android.material.R.attr.colorPrimary); } @Test(expected = BaristaException.class) From f04f6b331a0069c0d0ca071f50225ae74782123a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 24 Oct 2023 09:19:40 +0200 Subject: [PATCH 15/16] DIsable barista-compose --- .github/workflows/main.yml | 2 +- settings.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9fb99727..7ca7540f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,4 +54,4 @@ jobs: arch: x86_64 profile: pixel_2 disable-animations: true - script: ./gradlew :sample:connectedCheck :barista-compose:connectedCheck + script: ./gradlew :sample:connectedCheck diff --git a/settings.gradle.kts b/settings.gradle.kts index e9f06c1f..01d2682e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,4 +8,4 @@ pluginManagement { include(":sample") include(":barista") -include(":barista-compose") +//include(":barista-compose") From 48b8fb1f5fa9b347e1106fc781ad77d8e2957497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 24 Oct 2023 10:01:15 +0200 Subject: [PATCH 16/16] Non transitive R --- gradle.properties | 1 + .../android/barista/sample/ColorResourceTypeTest.kt | 2 +- .../com/adevinta/android/barista/sample/ColorsTest.java | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index b72dc0a1..32629cb4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,3 +19,4 @@ org.gradle.vfs.watch=true #org.gradle.unsafe.configuration-cache-problems=warn #org.gradle.unsafe.configuration-cache.max-problems=100 signing.gnupg.executable=gpg +android.nonTransitiveRClass=false diff --git a/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorResourceTypeTest.kt b/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorResourceTypeTest.kt index 501d0ecf..7186a46e 100644 --- a/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorResourceTypeTest.kt +++ b/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorResourceTypeTest.kt @@ -16,7 +16,7 @@ class ColorResourceTypeTest { @Test fun color_resource_type_color_attr() { - val type = com.google.android.material.R.attr.colorPrimary.colorResourceType + val type = R.attr.colorPrimary.colorResourceType assertEquals(type, ColorResourceType.COLOR_ATTR) } diff --git a/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorsTest.java b/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorsTest.java index 342d37ce..d928abde 100644 --- a/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorsTest.java +++ b/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorsTest.java @@ -31,8 +31,8 @@ public void checkColorList_whenDefault() { @Test public void checkColorAttribute() { - assertTextColorIs(R.id.textColorAttribute, com.google.android.material.R.attr.colorPrimary); - assertTextColorIsNot(R.id.textColorAttribute, com.google.android.material.R.attr.colorError); + assertTextColorIs(R.id.textColorAttribute, R.attr.colorPrimary); + assertTextColorIsNot(R.id.textColorAttribute, R.attr.colorError); } @Test @@ -84,7 +84,7 @@ public void checkSimpleColor_fails() { @Test(expected = BaristaException.class) public void checkColorAttr_fails() { - assertTextColorIs(R.id.textColorAttribute, com.google.android.material.R.attr.colorError); + assertTextColorIs(R.id.textColorAttribute, R.attr.colorError); } @Test(expected = BaristaException.class) @@ -99,7 +99,7 @@ public void checkNotSimpleColor_fails() { @Test(expected = BaristaException.class) public void checkNotColorAttr_fails() { - assertTextColorIsNot(R.id.textColorAttribute, com.google.android.material.R.attr.colorPrimary); + assertTextColorIsNot(R.id.textColorAttribute, R.attr.colorPrimary); } @Test(expected = BaristaException.class)