Skip to content
This repository has been archived by the owner on Dec 15, 2023. It is now read-only.

Commit

Permalink
Version updates
Browse files Browse the repository at this point in the history
  • Loading branch information
AllanWang committed Dec 15, 2023
1 parent f5b0032 commit ff766fe
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 15 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
.idea/**/libraries
.idea/**/assetWizardSettings.xml
.idea/**/caches
.idea/deploymentTargetDropDown.xml
.idea/modules.xml
.idea/modules
10 changes: 10 additions & 0 deletions .idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions app-compose/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ plugins {
apply from: '../spotless.gradle'

android {
compileSdk 33
compileSdk 34

defaultConfig {
applicationId "com.pitchedapps.frost"
minSdk 26
targetSdk 33
targetSdk 34
versionCode 1
versionName "1.0"
multiDexEnabled = true
Expand All @@ -40,7 +40,7 @@ android {

composeOptions {
// https://developer.android.com/jetpack/androidx/releases/compose-compiler
kotlinCompilerExtensionVersion = "1.4.7"
kotlinCompilerExtensionVersion = "1.5.6"
}

buildTypes {
Expand Down Expand Up @@ -140,10 +140,10 @@ project.configurations.configureEach {

dependencies {

implementation "androidx.core:core-ktx:1.10.1"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"
implementation "androidx.core:core-ktx:1.12.0"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
implementation "androidx.appcompat:appcompat:1.6.1"
implementation "com.google.android.material:material:1.9.0"
implementation "com.google.android.material:material:1.11.0"

// implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1"
// implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
Expand All @@ -152,7 +152,7 @@ dependencies {

testImplementation "junit:junit:4.13.2"
testImplementation "com.google.truth:truth:1.1.3"
testImplementation "org.json:json:20220320"
testImplementation "org.json:json:20230227"
androidTestImplementation "androidx.test.ext:junit:1.1.5"
androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"

Expand All @@ -178,7 +178,7 @@ dependencies {
// https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-gecko/maven-metadata.xml
// https://github.com/mozilla-mobile/reference-browser/blob/master/buildSrc/src/main/java/AndroidComponents.kt
// https://nightly.maven.mozilla.org/maven2/org/mozilla/components/browser-engine-gecko/maven-metadata.xml
def mozillaAndroidComponents = "116.0.20230617040331"
def mozillaAndroidComponents = "122.0.20231214160125"

implementation "org.mozilla.components:lib-state:${mozillaAndroidComponents}"
// Kept for reference; not needed
Expand All @@ -188,16 +188,16 @@ dependencies {
def composeVersion = "1.4.3"

implementation("androidx.compose.ui:ui:${composeVersion}")
implementation("androidx.activity:activity-compose:1.7.2")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
implementation("androidx.navigation:navigation-compose:2.6.0")
implementation("androidx.activity:activity-compose:1.8.2")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2")
implementation("androidx.navigation:navigation-compose:2.7.6")
// Tooling support (Previews, etc.)
implementation("androidx.compose.ui:ui-tooling:${composeVersion}")
// Foundation (Border, Background, Box, Image, Scroll, shapes, animations, etc.)
implementation("androidx.compose.foundation:foundation:${composeVersion}")
// Material Design
implementation("androidx.compose.material:material:${composeVersion}")
implementation 'androidx.compose.material3:material3:1.2.0-alpha02'
implementation 'androidx.compose.material3:material3:1.2.0-beta01'
// Material design icons
implementation("androidx.compose.material:material-icons-core:${composeVersion}")
implementation("androidx.compose.material:material-icons-extended:${composeVersion}")
Expand Down
1 change: 0 additions & 1 deletion app-compose/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<application
android:name=".FrostApp"
android:allowBackup="true"
android:extractNativeLibs="false"
android:fullBackupContent="@xml/frost_backup_rules"
android:icon="@mipmap/ic_launcher_round"
android:label="@string/frost_name"
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {

plugins {
// https://mvnrepository.com/artifact/com.android.application/com.android.application.gradle.plugin?repo=google
id 'com.android.application' version '8.1.0-beta04' apply false
id 'com.android.application' version '8.2.0' apply false
id 'com.android.library' version '8.0.2' apply false
id 'org.jetbrains.kotlin.android' version '1.8.21' apply false
// https://mvnrepository.com/artifact/com.google.devtools.ksp/com.google.devtools.ksp.gradle.plugin
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

0 comments on commit ff766fe

Please sign in to comment.