Skip to content

Commit

Permalink
Merge branch 'master' into fix/nullabilityAndMemoryLeak
Browse files Browse the repository at this point in the history
  • Loading branch information
saschoar authored Oct 25, 2023
2 parents b4a7572 + d998c44 commit d4e71f4
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:7.0.3")
classpath("com.android.tools.build:gradle:7.0.4")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
classpath("com.github.dcendents:android-maven-gradle-plugin:2.1")
}
Expand Down
6 changes: 3 additions & 3 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ plugins {
id("com.android.library")
id("kotlin-android")
id("maven-publish")
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.8.0"
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.2"
}

android {
compileSdkVersion(31)
compileSdk 34

defaultConfig {
minSdkVersion(16)
targetSdkVersion(31)
targetSdkVersion(34)
setProperty("archivesBaseName", "com.transferwise.sequencelayout-${versionName}")
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import android.view.LayoutInflater
import android.view.View
import android.widget.FrameLayout

internal class SequenceStepDot(context: Context, attrs: AttributeSet?, defStyleAttr: Int) :
FrameLayout(context, attrs, defStyleAttr) {

constructor(context: Context) : this(context, null)
constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
internal class SequenceStepDot @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = 0
) : FrameLayout(context, attrs, defStyleAttr) {

private var pulseAnimator: AnimatorSet? = null

Expand Down
4 changes: 2 additions & 2 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ plugins {
}

android {
compileSdkVersion(31)
compileSdk 34
defaultConfig {
minSdkVersion(16)
targetSdkVersion(31)
targetSdkVersion(34)
applicationId = "com.transferwise.sequencelayout.sample"
}
compileOptions {
Expand Down

0 comments on commit d4e71f4

Please sign in to comment.