Android Studio Dolphinでビルドできるようにした

jageishi · Oct 26, 2022 · 8489b21 · 8489b21
1 parent ed1e202
commit 8489b21
Show file tree

Hide file tree

Showing 16 changed files with 92 additions and 50 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,11 +9,11 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 28
+    compileSdk 32
     defaultConfig {
         applicationId "org.ageage.eggplant"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 32
         versionCode 1
         versionName "0.9.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -42,21 +42,21 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.7.0'
     implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.fragment:fragment-ktx:1.1.0'
-    implementation 'androidx.preference:preference:1.1.0'
+    implementation 'androidx.fragment:fragment-ktx:1.5.4'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
     implementation 'com.jakewharton.timber:timber:4.7.1'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.10'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
     implementation 'com.github.bumptech.glide:glide:4.9.0'
-    implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.6'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.6'
+    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1'
 
     def okhttp_version = '4.2.0'
     implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
@@ -67,14 +67,14 @@ dependencies {
     implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit_version"
     implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
 
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0'
-    testImplementation 'junit:junit:4.12'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
     testImplementation 'org.assertj:assertj-core:3.14.0'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.5'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1'
 
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation 'androidx.arch.core:core-testing:2.1.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,9 @@
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:ignore="AllowBackup,GoogleAppIndexingWarning,UnusedAttribute">
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/app/src/main/java/org/ageage/eggplant/MainActivity.kt b/app/src/main/java/org/ageage/eggplant/MainActivity.kt
@@ -33,8 +33,8 @@ class MainActivity : AppCompatActivity() {
         return super.onCreateOptionsMenu(menu)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        when (item?.itemId) {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
             android.R.id.home -> {
                 drawerLayout?.openDrawer(GravityCompat.START)
             }

diff --git a/app/src/main/java/org/ageage/eggplant/bookmarks/BookmarksActivity.kt b/app/src/main/java/org/ageage/eggplant/bookmarks/BookmarksActivity.kt
@@ -21,14 +21,14 @@ class BookmarksActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_bookmarks)
         intent?.let {
-            title = it.getStringExtra(TITLE)
-            url = it.getStringExtra(URL)
+            title = it.getStringExtra(TITLE) ?: ""
+            url = it.getStringExtra(URL) ?: ""
         }
         initViews()
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        when (item?.itemId) {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
             android.R.id.home -> finish()
         }
         return super.onOptionsItemSelected(item)

diff --git a/app/src/main/java/org/ageage/eggplant/bookmarks/BookmarksViewModelFactory.kt b/app/src/main/java/org/ageage/eggplant/bookmarks/BookmarksViewModelFactory.kt
@@ -2,13 +2,14 @@ package org.ageage.eggplant.bookmarks
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewmodel.CreationExtras
 import org.ageage.eggplant.common.repository.BookmarkRepository
 import org.ageage.eggplant.common.schedulerprovider.SchedulerProvider
 
 class BookmarksViewModelFactory : ViewModelProvider.Factory {
 
     @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+    override fun <T : ViewModel> create(modelClass: Class<T>, extras: CreationExtras): T {
         if (modelClass != BookmarksViewModel::class.java) {
             throw IllegalArgumentException("Illegal ViewModel class.")
         }

diff --git a/app/src/main/java/org/ageage/eggplant/common/ui/adapter/FeedItemAdapter.kt b/app/src/main/java/org/ageage/eggplant/common/ui/adapter/FeedItemAdapter.kt
@@ -102,6 +102,7 @@ class FeedItemAdapter(
                     holder.binding.linkUrl.text = item.item.link
                 }
             }
+            FeedItemAdapterItem.Progress -> {}
         }
     }
 

diff --git a/app/src/main/java/org/ageage/eggplant/feed/FeedItemsViewModelFactory.kt b/app/src/main/java/org/ageage/eggplant/feed/FeedItemsViewModelFactory.kt
@@ -2,12 +2,13 @@ package org.ageage.eggplant.feed
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewmodel.CreationExtras
 import org.ageage.eggplant.common.repository.FeedRepository
 
 class FeedItemsViewModelFactory : ViewModelProvider.Factory {
 
     @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+    override fun <T : ViewModel> create(modelClass: Class<T>, extras: CreationExtras): T {
         if (modelClass != FeedItemsViewModel::class.java) {
             throw IllegalArgumentException("Illegal ViewModel class.")
         }

diff --git a/app/src/main/java/org/ageage/eggplant/search/SearchActivity.kt b/app/src/main/java/org/ageage/eggplant/search/SearchActivity.kt
@@ -28,8 +28,8 @@ class SearchActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         return true
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        when (item?.itemId) {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
             android.R.id.home -> finish()
         }
         return super.onOptionsItemSelected(item)

diff --git a/app/src/main/java/org/ageage/eggplant/search/SearchResultFragment.kt b/app/src/main/java/org/ageage/eggplant/search/SearchResultFragment.kt
@@ -146,6 +146,7 @@ class SearchResultFragment : Fragment(), FeedItemAdapter.OnClickListener,
                         viewModel.loadNextPage()
                     }
                 }
+                SearchResultViewModel.Status.LoadingNextPage -> {}
             }
         })
     }

diff --git a/app/src/main/java/org/ageage/eggplant/search/SearchResultViewModelFactory.kt b/app/src/main/java/org/ageage/eggplant/search/SearchResultViewModelFactory.kt
@@ -2,12 +2,13 @@ package org.ageage.eggplant.search
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewmodel.CreationExtras
 import org.ageage.eggplant.common.repository.FeedRepository
 
 class SearchResultViewModelFactory : ViewModelProvider.Factory {
 
     @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+    override fun <T : ViewModel> create(modelClass: Class<T>, extras: CreationExtras): T {
         if (modelClass != SearchResultViewModel::class.java) {
             throw IllegalArgumentException("Illegal ViewModel class.")
         }

diff --git a/app/src/main/java/org/ageage/eggplant/settings/SettingActivity.kt b/app/src/main/java/org/ageage/eggplant/settings/SettingActivity.kt
@@ -31,8 +31,8 @@ class SettingActivity : AppCompatActivity() {
         }
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        when (item?.itemId) {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
             android.R.id.home -> finish()
         }
 

diff --git a/build.gradle b/build.gradle
@@ -1,23 +1,23 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.7.20'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.android.gms:oss-licenses-plugin:0.9.5'
+        classpath 'com.google.android.gms:oss-licenses-plugin:0.10.5'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
 
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jul 31 21:43:18 JST 2019
+#Wed Oct 26 23:13:21 JST 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+zipStoreBase=GRADLE_USER_HOME