Skip to content

Commit

Permalink
Update all outdated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
saket committed Aug 28, 2024
1 parent 2d363e2 commit fd42af7
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 23 deletions.
18 changes: 6 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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'
]
Expand All @@ -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"
}
}

Expand All @@ -27,7 +25,3 @@ allprojects {
mavenCentral()
}
}

task clean(type: Delete) {
delete rootProject.buildDir
}
1 change: 1 addition & 0 deletions extendedspans/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ apply plugin: 'app.cash.paparazzi'

android {
resourcePrefix "extendedspans_"
namespace "me.saket.extendedspans"

compileSdkVersion versions.compileSdk
defaultConfig.minSdkVersion 21
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
9 changes: 5 additions & 4 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
}

0 comments on commit fd42af7

Please sign in to comment.