Skip to content

Commit

Permalink
dev12
Browse files Browse the repository at this point in the history
  • Loading branch information
mvarnagiris committed May 30, 2020
1 parent a9f10af commit 5f74d9a
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.0-alpha03'
classpath 'com.android.tools.build:gradle:4.1.0-alpha10'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
5 changes: 2 additions & 3 deletions compose-glide-image/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion "0.1.0-dev11"
kotlinCompilerExtensionVersion "0.1.0-dev12"
kotlinCompilerVersion "1.3.70-dev-withExperimentalGoogleExtensions-20200424"
}
}

dependencies {
def compose_version = '0.1.0-dev11'
def compose_version = '0.1.0-dev12'
def coroutines_version = "1.3.6"

implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
Expand All @@ -53,5 +53,4 @@ dependencies {

implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"

}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import androidx.ui.foundation.Canvas
import androidx.ui.foundation.Image
import androidx.ui.graphics.ImageAsset
import androidx.ui.graphics.asImageAsset
import androidx.ui.graphics.painter.drawCanvas
import androidx.ui.graphics.drawscope.drawCanvas
import androidx.ui.layout.fillMaxSize
import androidx.ui.unit.IntPx
import com.bumptech.glide.Glide
Expand Down Expand Up @@ -90,7 +90,7 @@ fun GlideImage(
Image(asset = theImage)
} else if (theDrawable != null) {
Canvas(modifier = Modifier.fillMaxSize()) {
drawCanvas { canvas, pxSize -> theDrawable.draw(canvas.nativeCanvas) }
drawCanvas { canvas, _ -> theDrawable.draw(canvas.nativeCanvas) }
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Apr 19 14:41:41 EEST 2020
#Sat May 30 15:32:47 EEST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-milestone-1-all.zip

0 comments on commit 5f74d9a

Please sign in to comment.