Skip to content

Commit

Permalink
0.4.0 (#14)
Browse files Browse the repository at this point in the history
1. bump deps;
2. update kotlin to 2.0;
3. upgrade AGP to 8.5.1, gradlew to 8.9.
  • Loading branch information
kid1412621 authored Jul 24, 2024
1 parent d3a503c commit 2101b12
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 23 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ google-services.json

# OS files
.DS_Store
.java-version
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 0.4.0 - 2024-07-24

- Bump AGP to 8.5.1, gradlew to 8.9;
- Bump Kotlin to 2.0;

## 0.3.0 - 2024-05-31

- rewrote paging with jetpack paging 3;
Expand Down
30 changes: 15 additions & 15 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import com.android.build.api.dsl.ApkSigningConfig
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
import java.io.FileInputStream
import java.util.Properties

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("org.jetbrains.kotlin.plugin.compose")
id("com.google.devtools.ksp")
id("com.google.dagger.hilt.android")
id("com.google.gms.google-services")
Expand All @@ -24,9 +24,9 @@ android {
applicationId = "me.nanova.subspace"
minSdk = 29
targetSdk = 34
versionCode = 10
versionName = "0.3.0"
archivesName = "subspace-v${versionName}-${versionCode}"
versionCode = 11
versionName = "0.4.0"
setProperty("archivesBaseName", "subspace-v${versionName}-${versionCode}")

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
Expand Down Expand Up @@ -98,10 +98,10 @@ android {
compose = true
buildConfig = true
}
composeOptions {
// https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility
kotlinCompilerExtensionVersion = "1.5.13"
}
}

composeCompiler {
enableStrongSkippingMode = true
}

androidComponents {
Expand All @@ -119,7 +119,7 @@ dependencies {
implementation("androidx.core:core-ktx:1.13.1")

// https://developer.android.com/jetpack/compose/bom/bom-mapping
val composeBom = platform("androidx.compose:compose-bom:2024.05.00")
val composeBom = platform("androidx.compose:compose-bom:2024.06.00")
implementation(composeBom)
implementation("androidx.activity:activity-ktx:1.9.0")
implementation("androidx.activity:activity-compose")
Expand All @@ -140,12 +140,12 @@ dependencies {

// Material Design 3
// implementation("androidx.compose.material3:material3")
// wait for https://developer.android.com/reference/kotlin/androidx/compose/material3/package-summary#DismissibleDrawerSheet(androidx.compose.material3.DrawerState,androidx.compose.ui.Modifier,androidx.compose.ui.graphics.Shape,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.ui.unit.Dp,androidx.compose.foundation.layout.WindowInsets,kotlin.Function1)
// TODO: wait for https://developer.android.com/reference/kotlin/androidx/compose/material3/package-summary#DismissibleDrawerSheet(androidx.compose.material3.DrawerState,androidx.compose.ui.Modifier,androidx.compose.ui.graphics.Shape,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.ui.unit.Dp,androidx.compose.foundation.layout.WindowInsets,kotlin.Function1)
// see: https://developer.android.com/jetpack/androidx/releases/compose-material3#1.3.0-alpha04
implementation("androidx.compose.material3:material3:1.3.0-beta01")
implementation("androidx.compose.material3:material3:1.3.0-beta04")
// wait for MD3 implementation
implementation("androidx.compose.material:material-icons-extended")
implementation("androidx.compose.animation:animation:1.6.7")
implementation("androidx.compose.animation:animation:1.6.8")
implementation("androidx.compose.animation:animation-graphics")
// not ready yet
// implementation("androidx.compose.material3:material3-adaptive:1.0.0-alpha08")
Expand Down Expand Up @@ -174,7 +174,7 @@ dependencies {
implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")

// firebase
implementation(platform("com.google.firebase:firebase-bom:33.0.0"))
implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
implementation("com.google.firebase:firebase-crashlytics")
implementation("com.google.firebase:firebase-analytics")

Expand All @@ -185,6 +185,6 @@ dependencies {
debugImplementation("androidx.compose.ui:ui-test-manifest")

testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation("androidx.test.ext:junit:1.2.1")
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
}
15 changes: 10 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.4.1" apply false
id("org.jetbrains.kotlin.android") version "1.9.23" apply false
id("com.google.devtools.ksp") version "1.9.23-1.0.20" apply false
// https://developer.android.com/build/releases/gradle-plugin
id("com.android.application") version "8.5.1" apply false
// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.android
id("org.jetbrains.kotlin.android") version "2.0.0" apply false
// https://developer.android.com/develop/ui/compose/compiler#set-gradle
id("org.jetbrains.kotlin.plugin.compose") version "2.0.0" apply false
// https://github.com/google/ksp/releases
id("com.google.devtools.ksp") version "2.0.0-1.0.22" apply false
id("com.google.dagger.hilt.android") version "2.50" apply false
id("com.google.gms.google-services") version "4.4.1" apply false
id("com.google.firebase.crashlytics") version "2.9.9" apply false
id("com.google.gms.google-services") version "4.4.2" apply false
id("com.google.firebase.crashlytics") version "3.0.2" apply false
}
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ kotlin.code.style=official
# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.nonTransitiveRClass=true
android.lint.useK2Uast=true
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#Mon Jan 01 21:16:01 CST 2024
#Wed Jul 24 23:04:49 CST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit 2101b12

Please sign in to comment.