Skip to content

Update library 20240321 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caad1229 merged 4 commits into from
Mar 22, 2024
Merged

Update library 20240321 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5ea914
update agp to 8.3.0
caad1229 Mar 21, 2024
60c59bf
update library
caad1229 Mar 21, 2024
02c389c
fix build warning
caad1229 Mar 21, 2024
9f53eba
fix
caad1229 Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ android {

defaultConfig {
applicationId "us.mitene.practicalexam"
minSdkVersion 25
minSdkVersion 26
targetSdkVersion 34
versionCode 1
versionName "1.0"
Expand Down Expand Up @@ -41,7 +41,7 @@ android {
targetCompatibility JavaVersion.VERSION_17
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.7"
kotlinCompilerExtensionVersion = "1.5.11"
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
Expand All @@ -63,36 +63,36 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

// jetpack compose bom
implementation platform('androidx.compose:compose-bom:2023.10.01')
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material:material"
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.compose.ui:ui-tooling-preview"
implementation platform('androidx.compose:compose-bom:2024.03.00')
implementation 'androidx.compose.ui:ui'
implementation 'androidx.compose.material:material'
implementation 'androidx.compose.material:material-icons-extended'
implementation 'androidx.compose.ui:ui-tooling-preview'
implementation 'androidx.compose.material3:material3'
debugImplementation "androidx.compose.ui:ui-tooling"
debugImplementation "androidx.compose.ui:ui-test-manifest"
implementation "androidx.compose.runtime:runtime-livedata"
debugImplementation 'androidx.compose.ui:ui-tooling'
debugImplementation 'androidx.compose.ui:ui-test-manifest'
implementation 'androidx.compose.runtime:runtime-livedata'
// jetpack compose
implementation 'androidx.activity:activity-compose:1.8.2'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0'

// for test
testImplementation 'org.robolectric:robolectric:4.10.3'
testImplementation 'org.robolectric:robolectric:4.11.1'
testImplementation "androidx.test:core:1.5.0"
testImplementation "androidx.test:core-ktx:1.5.0"
testImplementation "androidx.test.ext:junit:1.1.5"
testImplementation "androidx.test.ext:junit-ktx:1.1.5"
testImplementation("androidx.arch.core:core-testing:2.2.0")
testImplementation "io.mockk:mockk:1.13.8"
testImplementation "org.mockito:mockito-core:5.5.0"
testImplementation 'io.mockk:mockk:1.13.10'
testImplementation 'org.mockito:mockito-core:5.11.0'

// jet pack
implementation "androidx.fragment:fragment-ktx:1.6.2"
implementation "androidx.recyclerview:recyclerview:1.3.2"

// androidx.lifecycle
def lifecycle_version = "2.6.2"
def lifecycle_version = "2.7.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
//noinspection LifecycleAnnotationProcessorWithJava8
Expand All @@ -109,20 +109,20 @@ dependencies {
testImplementation("androidx.room:room-testing:$room_version")

// okhttp
def okhttp_version = "4.10.0"
def okhttp_version = "4.12.0"
implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
implementation "com.squareup.okhttp3:logging-interceptor:$okhttp_version"
testImplementation "com.squareup.okhttp3:mockwebserver:$okhttp_version"

// glide
def glide_version = "4.15.1"
def glide_version = '4.16.0'
implementation "com.github.bumptech.glide:glide:$glide_version"
implementation "com.github.bumptech.glide:glide:$glide_version"
implementation "com.github.bumptech.glide:annotations:$glide_version"
kapt "com.github.bumptech.glide:compiler:$glide_version"

// coroutine
def coroutine_version = "1.7.3"
def coroutine_version = "1.8.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutine_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutine_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$coroutine_version"
Expand All @@ -134,7 +134,7 @@ dependencies {
implementation "io.reactivex.rxjava2:rxkotlin:2.4.0"

// retrofit
def retrofit2_version = "2.9.0"
def retrofit2_version = "2.10.0"
implementation "com.squareup.retrofit2:retrofit:$retrofit2_version"
implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit2_version"
implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"
Expand All @@ -145,21 +145,21 @@ dependencies {
implementation "com.google.code.gson:gson:2.10.1"

// moshi
implementation "com.squareup.moshi:moshi-kotlin:1.13.0"
implementation 'com.squareup.moshi:moshi-kotlin:1.15.1'

// serialization
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1"
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3'

// timber
implementation "com.jakewharton.timber:timber:5.0.1"

// DI : dagger
implementation 'com.google.dagger:dagger:2.48'
kapt 'com.google.dagger:dagger-compiler:2.48'
implementation 'com.google.dagger:dagger:2.51'
kapt 'com.google.dagger:dagger-compiler:2.51'

// DI : hilt
implementation 'com.google.dagger:hilt-android:2.48'
kapt 'com.google.dagger:hilt-compiler:2.48'
testImplementation 'com.google.dagger:hilt-android-testing:2.48'
kaptTest 'com.google.dagger:hilt-compiler:2.48'
implementation 'com.google.dagger:hilt-android:2.51'
kapt 'com.google.dagger:hilt-compiler:2.51'
testImplementation 'com.google.dagger:hilt-android-testing:2.51'
kaptTest 'com.google.dagger:hilt-compiler:2.51'
}
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.9.21'
ext.kotlin_version = '1.9.23'
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.4'
classpath 'com.android.tools.build:gradle:8.3.0'
Copy link
Copy Markdown

@BeniwasabiKarashi BeniwasabiKarashi Mar 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AGPのVersion的にAndroudStudio Iguana以降が前提となってしまっているのですが、こちらは大丈夫ですか？
https://developer.android.com/studio/releases#android_gradle_plugin_and_android_studio_compatibility

Copy link
Copy Markdown

@BeniwasabiKarashi BeniwasabiKarashi Mar 21, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AGPのVersion8.3.0でもいい気がしてきましたが、それであれば 試験にIguana以降を使用してもらうことを事前に候補者の方に伝えたほうがいいかなと思いました(このPRをいつmergeするかによりますが、Iguanaは2024.02.01 stableのVersionなのでだいぶ最新のVersion追ってる人じゃないとAndroidStudioの入れ直しからになりそうです)。

Copy link
Copy Markdown
Contributor Author

@caad1229 caad1229 Mar 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

確か最新の Android Studio 使うような案内をしてもらっているので大丈夫だという認識です。
もし入れ直しが発生するようでしたら、この PR 前に checkout してもらえばよいだけかと.

Copy link
Copy Markdown

@BeniwasabiKarashi BeniwasabiKarashi Mar 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

たしかにそこまでの懸念点というほどではないですね 🤔
問題なさそうだと思います！

classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
classpath 'com.google.dagger:hilt-android-gradle-plugin:2.48'
classpath 'com.google.dagger:hilt-android-gradle-plugin:2.51'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
android.useAndroidX=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Jul 08 11:59:58 JST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME