Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
SmartToolFactory committed May 16, 2023
1 parent 4ef269a commit a13aa40
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 32 deletions.
23 changes: 12 additions & 11 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.3.2"
kotlinCompilerExtensionVersion = "1.4.7"
}
packagingOptions {
resources {
Expand All @@ -50,15 +50,15 @@ dependencies {

implementation project(':cropper')

implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'

// Colorful Customizable Sliders
implementation 'com.github.SmartToolFactory:Compose-Colorful-Sliders:1.1.0'
implementation 'com.github.SmartToolFactory:Compose-Colorful-Sliders:1.2.0'
// Color picker
implementation 'com.github.SmartToolFactory:Compose-Color-Picker-Bundle:1.0.1'
// Gestures
implementation 'com.github.SmartToolFactory:Compose-Extended-Gestures:2.1.0'
implementation 'com.github.SmartToolFactory:Compose-Extended-Gestures:3.0.0'
// Animated List
implementation 'com.github.SmartToolFactory:Compose-AnimatedList:0.5.1'

Expand All @@ -73,31 +73,32 @@ dependencies {
implementation "androidx.compose.material:material-icons-core:$compose_version"
implementation "androidx.compose.material:material-icons-extended:$compose_version"
// Integration with activities
implementation 'androidx.activity:activity-compose:1.6.1'
implementation 'androidx.activity:activity-compose:1.7.1'
// Integration with ViewModels
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1'
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1'

// Material Design 3 for Compose
implementation "androidx.compose.material3:material3:1.0.0"
implementation "androidx.compose.material3:material3:1.1.0"

def nav_compose_version = "2.5.3"
implementation "androidx.navigation:navigation-compose:$nav_compose_version"

def accompanist_version = "0.25.0"

// Accompanist
implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version"
implementation "com.google.accompanist:accompanist-pager:$accompanist_version"
implementation "com.google.accompanist:accompanist-drawablepainter:$accompanist_version"

// Coil
implementation("io.coil-kt:coil-compose:2.1.0")
implementation("io.coil-kt:coil-compose:2.2.2")

// Photo Picker
implementation("com.google.modernstorage:modernstorage-photopicker:1.0.0-alpha06")

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,6 @@ internal fun ExposedSelectionMenu(
fontSize = 14.sp
),
colors: TextFieldColors = ExposedDropdownMenuDefaults.textFieldColors(
containerColor = Color.Transparent,
focusedIndicatorColor = Color.Transparent,
unfocusedIndicatorColor = Color.Transparent,
disabledIndicatorColor = Color.Transparent
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import android.annotation.SuppressLint
import android.graphics.Bitmap
import android.graphics.ImageDecoder
import android.net.Uri
import android.os.Build
import android.provider.MediaStore
import androidx.activity.compose.rememberLauncherForActivityResult
Expand Down Expand Up @@ -451,7 +452,7 @@ private fun PickImageMask(
) {
val context = LocalContext.current

val photoPicker = rememberLauncherForActivityResult(PhotoPicker()) { uris ->
val photoPicker = rememberLauncherForActivityResult(PhotoPicker()) { uris: List<Uri> ->
val uri = uris.firstOrNull() ?: return@rememberLauncherForActivityResult

val bitmap: Bitmap = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
Expand Down
14 changes: 5 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
buildscript {
ext {
compose_version = '1.3.0'
compose_version = '1.4.3'
}
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '7.3.1' apply false
id 'com.android.library' version '7.3.1' apply false
id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
}

task clean(type: Delete) {
delete rootProject.buildDir
plugins {
id 'com.android.application' version '8.0.0' apply false
id 'com.android.library' version '8.0.0' apply false
id 'org.jetbrains.kotlin.android' version '1.8.21' apply false
}
12 changes: 6 additions & 6 deletions cropper/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.3.2"
kotlinCompilerExtensionVersion = "1.4.7"
}

packagingOptions {
Expand All @@ -44,22 +44,22 @@ android {

dependencies {

implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.core:core-ktx:1.10.1'

implementation 'com.github.SmartToolFactory:Compose-Extended-Gestures:2.1.0'
implementation 'com.github.SmartToolFactory:Compose-Extended-Gestures:3.0.0'

// Jetpack Compose
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.runtime:runtime:$compose_version"

// Material Design 3 for Compose
implementation "androidx.compose.material3:material3:1.0.0"
implementation "androidx.compose.material3:material3:1.1.0"
// Material design icons
implementation "androidx.compose.material:material-icons-extended:$compose_version"

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
}
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Aug 24 19:04:08 TRT 2022
#Tue May 16 20:15:34 TRT 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-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
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencyResolutionManagement {
repositories {
google()
mavenCentral()
maven { url 'https://jitpack.io'}
maven { url 'https://jitpack.io' }
}
}
rootProject.name = "Compose Cropper"
Expand Down

0 comments on commit a13aa40

Please sign in to comment.