Skip to content

Commit

Permalink
Update Jetpack Compose (1.3.0 - 2022.10.00)
Browse files Browse the repository at this point in the history
  • Loading branch information
jeluchu committed Oct 26, 2022
1 parent d067f4e commit 16f35f3
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 34 deletions.
31 changes: 17 additions & 14 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion = "1.2.0"
kotlinCompilerExtensionVersion = "1.3.2"
}

compileOptions {
Expand All @@ -50,24 +50,27 @@ android {
dependencies {

implementation project(':jchucomponents')
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

// JETPACK COMPOSE -----------------------------------------------------------------------------
implementation 'androidx.compose.ui:ui:1.2.1'
implementation 'androidx.compose.material:material:1.2.1'
implementation 'androidx.compose.ui:ui-tooling-preview:1.2.1'
debugImplementation 'androidx.compose.ui:ui-tooling:1.2.1'
implementation platform("androidx.compose:compose-bom:2022.10.00")
implementation 'androidx.compose.ui:ui'
implementation 'androidx.compose.material:material'
implementation 'androidx.compose.ui:ui-tooling-preview'
debugImplementation 'androidx.compose.ui:ui-tooling'
implementation 'androidx.compose.material:material-icons-extended'
implementation 'androidx.compose.foundation:foundation'
implementation 'androidx.compose.foundation:foundation-layout'
implementation 'androidx.compose.animation:animation'
implementation 'androidx.compose.runtime:runtime'
implementation 'androidx.compose.runtime:runtime-livedata'

// ANDROIDX - GOOGLE LIBRARY -------------------------------------------------------------------
implementation 'androidx.activity:activity-compose:1.6.0'
implementation 'androidx.compose.material:material-icons-extended:1.2.1'
implementation 'androidx.compose.foundation:foundation:1.2.1'
implementation 'androidx.compose.foundation:foundation-layout:1.2.1'
implementation 'androidx.compose.animation:animation:1.2.1'
implementation 'androidx.compose.runtime:runtime:1.2.1'
implementation 'androidx.compose.runtime:runtime-livedata:1.2.1'
implementation 'androidx.constraintlayout:constraintlayout-compose:1.0.1'
implementation 'androidx.navigation:navigation-compose:2.5.2'
implementation 'androidx.activity:activity-compose:1.6.0'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.google.android.material:material:1.7.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

}
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.10"
classpath 'com.android.tools.build:gradle:7.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.20"
}
}

Expand Down
37 changes: 20 additions & 17 deletions jchucomponents/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ android {
}

buildFeatures.compose = true
composeOptions.kotlinCompilerExtensionVersion = "1.2.0"
composeOptions.kotlinCompilerExtensionVersion = "1.3.2"

buildTypes {
release {
Expand Down Expand Up @@ -69,36 +69,39 @@ dependencies {
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'

// JETPACK COMPOSE -----------------------------------------------------------------------------
implementation 'androidx.compose.ui:ui:1.2.1'
implementation 'androidx.compose.material:material:1.2.1'
implementation 'androidx.compose.ui:ui-tooling-preview:1.2.1'
implementation platform("androidx.compose:compose-bom:2022.10.00")
implementation 'androidx.compose.ui:ui'
implementation 'androidx.compose.material:material'
implementation 'androidx.compose.ui:ui-tooling-preview'
debugImplementation 'androidx.compose.ui:ui-tooling'
implementation 'androidx.compose.material:material-icons-extended'
implementation 'androidx.compose.foundation:foundation'
implementation 'androidx.compose.foundation:foundation-layout'
implementation 'androidx.compose.animation:animation'
implementation 'androidx.compose.runtime:runtime'
implementation 'androidx.compose.runtime:runtime-livedata'

// ANDROIDX - GOOGLE LIBRARY -------------------------------------------------------------------
implementation 'androidx.activity:activity-compose:1.6.0'
implementation 'androidx.core:core-splashscreen:1.0.0'
implementation 'com.google.android.gms:play-services-base:18.1.0'
debugImplementation 'androidx.compose.ui:ui-tooling:1.2.1'
implementation 'androidx.compose.material:material-icons-extended:1.2.1'
implementation 'androidx.compose.foundation:foundation:1.2.1'
implementation 'androidx.compose.foundation:foundation-layout:1.2.1'
implementation 'androidx.compose.animation:animation:1.2.1'
implementation 'androidx.compose.runtime:runtime:1.2.1'
implementation 'androidx.compose.runtime:runtime-livedata:1.2.1'
implementation 'androidx.constraintlayout:constraintlayout-compose:1.0.1'
implementation 'androidx.navigation:navigation-compose:2.5.2'
implementation 'com.google.android.gms:play-services-base:18.1.0'

// FIREBASE LIBRARY ----------------------------------------------------------------------------
implementation("com.google.firebase:firebase-analytics-ktx:21.1.1")
implementation 'com.google.firebase:firebase-analytics-ktx:21.2.0'

// ACCOMPANIST GOOGLE LIBRARY ------------------------------------------------------------------
implementation 'com.google.accompanist:accompanist-systemuicontroller:0.25.1'
implementation 'com.google.accompanist:accompanist-navigation-animation:0.25.1'
implementation 'com.google.accompanist:accompanist-systemuicontroller:0.27.0'
implementation 'com.google.accompanist:accompanist-navigation-animation:0.27.0'

// ANDROIDX LIBRARY ----------------------------------------------------------------------------
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.browser:browser:1.4.0'
implementation 'androidx.preference:preference-ktx:1.2.0'

// GOOGLE LIBRARY ------------------------------------------------------------------------------
implementation 'com.google.code.gson:gson:2.9.1'
implementation 'com.google.code.gson:gson:2.10'

// SQUAREUP LIBRARY ----------------------------------------------------------------------------
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
Expand All @@ -117,7 +120,7 @@ afterEvaluate {
from components.release
groupId = "com.jeluchu"
artifactId = "jchucomponents"
version = "1.0.0-beta04"
version = "1.0.0-beta05"
}
}
}
Expand Down

0 comments on commit 16f35f3

Please sign in to comment.