diff --git a/build.gradle b/build.gradle index 65a9f76..be9919e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,6 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { ext.versions = [ - compileSdk: 32, + compileSdk: 34, composeUi: '1.7.0-rc01', composeCompiler: '1.5.15' ] @@ -13,11 +11,11 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:7.1.3" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21" - classpath "com.vanniktech:gradle-maven-publish-plugin:0.21.0" - classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.6.10" - classpath "app.cash.paparazzi:paparazzi-gradle-plugin:1.0.0" + classpath "com.android.tools.build:gradle:8.5.2" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25" + classpath "com.vanniktech:gradle-maven-publish-plugin:0.29.0" + classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.9.20" + classpath "app.cash.paparazzi:paparazzi-gradle-plugin:1.3.4" } } @@ -27,7 +25,3 @@ allprojects { mavenCentral() } } - -task clean(type: Delete) { - delete rootProject.buildDir -} diff --git a/extendedspans/build.gradle b/extendedspans/build.gradle index 7f746f1..fcab352 100644 --- a/extendedspans/build.gradle +++ b/extendedspans/build.gradle @@ -5,6 +5,7 @@ apply plugin: 'app.cash.paparazzi' android { resourcePrefix "extendedspans_" + namespace "me.saket.extendedspans" compileSdkVersion versions.compileSdk defaultConfig.minSdkVersion 21 diff --git a/extendedspans/src/test/kotlin/me/saket/extendedspans/AllSpanPaintersTest.kt b/extendedspans/src/test/kotlin/me/saket/extendedspans/AllSpanPaintersTest.kt index 05bb9f8..deef75d 100644 --- a/extendedspans/src/test/kotlin/me/saket/extendedspans/AllSpanPaintersTest.kt +++ b/extendedspans/src/test/kotlin/me/saket/extendedspans/AllSpanPaintersTest.kt @@ -20,8 +20,8 @@ class AllSpanPaintersTest( @get:Rule val paparazzi = Paparazzi( theme = "Theme.NoTitleBar.Fullscreen", - deviceConfig = DeviceConfig.PIXEL_5.copy(softButtons = false, screenHeight = 0), - renderingMode = RenderingMode.V_SCROLL, + deviceConfig = DeviceConfig.PIXEL_5, + renderingMode = RenderingMode.SHRINK, ) @Test fun snapshot() { diff --git a/extendedspans/src/test/kotlin/me/saket/extendedspans/RoundedCornerSpanPainterTest.kt b/extendedspans/src/test/kotlin/me/saket/extendedspans/RoundedCornerSpanPainterTest.kt index dc3dc86..966a4fb 100644 --- a/extendedspans/src/test/kotlin/me/saket/extendedspans/RoundedCornerSpanPainterTest.kt +++ b/extendedspans/src/test/kotlin/me/saket/extendedspans/RoundedCornerSpanPainterTest.kt @@ -12,6 +12,7 @@ import androidx.compose.ui.unit.sp import app.cash.paparazzi.DeviceConfig import app.cash.paparazzi.Paparazzi import com.android.ide.common.rendering.api.SessionParams +import com.android.ide.common.rendering.api.SessionParams.RenderingMode import com.squareup.burst.BurstJUnit4 import me.saket.extendedspans.RoundedCornerSpanPainter.TextPaddingValues import org.junit.Rule @@ -25,8 +26,8 @@ class RoundedCornerSpanPainterTest( @get:Rule val paparazzi = Paparazzi( theme = "Theme.NoTitleBar.Fullscreen", - deviceConfig = DeviceConfig.PIXEL_5.copy(softButtons = false, screenHeight = 0), - renderingMode = SessionParams.RenderingMode.V_SCROLL, + deviceConfig = DeviceConfig.PIXEL_5, + renderingMode = RenderingMode.SHRINK, ) @Composable diff --git a/extendedspans/src/test/kotlin/me/saket/extendedspans/SquigglyUnderlineSpanPainterTest.kt b/extendedspans/src/test/kotlin/me/saket/extendedspans/SquigglyUnderlineSpanPainterTest.kt index 7283344..2b3162a 100644 --- a/extendedspans/src/test/kotlin/me/saket/extendedspans/SquigglyUnderlineSpanPainterTest.kt +++ b/extendedspans/src/test/kotlin/me/saket/extendedspans/SquigglyUnderlineSpanPainterTest.kt @@ -22,8 +22,8 @@ class SquigglyUnderlineSpanPainterTest( @get:Rule val paparazzi = Paparazzi( theme = "Theme.NoTitleBar.Fullscreen", - deviceConfig = DeviceConfig.PIXEL_5.copy(softButtons = false, screenHeight = 0), - renderingMode = RenderingMode.V_SCROLL, + deviceConfig = DeviceConfig.PIXEL_5, + renderingMode = RenderingMode.SHRINK, ) @Composable diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a2..4c26bae 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Wed Aug 28 11:46:04 EDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/sample/build.gradle b/sample/build.gradle index 9fdf28c..a2ad79e 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -3,9 +3,10 @@ apply plugin: 'kotlin-android' android { compileSdkVersion versions.compileSdk + namespace "me.saket.extendedspans.sample" defaultConfig { - applicationId "me.saket.extendedspans.sample" + applicationId namespace minSdkVersion 26 targetSdkVersion versions.compileSdk versionCode 1 @@ -31,11 +32,11 @@ android { dependencies { implementation project(':extendedspans') - implementation "androidx.appcompat:appcompat:1.4.2" + implementation "androidx.appcompat:appcompat:1.7.0" - implementation "androidx.activity:activity-compose:1.4.0" + implementation "androidx.activity:activity-compose:1.9.1" implementation "androidx.compose.ui:ui:$versions.composeUi" implementation "androidx.compose.ui:ui-tooling:$versions.composeUi" implementation "androidx.compose.foundation:foundation:$versions.composeUi" - implementation "androidx.compose.material3:material3:1.0.0-alpha13" + implementation "androidx.compose.material3:material3:1.2.1" }