diff --git a/.idea/misc.xml b/.idea/misc.xml
index 54d5acd7d7803e035156e6a92b2eac33785c8994..69d113f42b6501e3869200a85c41835667325f4f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="../../../../layout/custom_preview.xml" value="0.1" />
+      </map>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index a7f325d4ed13ab69f200f03a5c230b6c4df052f1..79b2381c5449c94b271b82a33514230973b07388 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,11 +7,11 @@ apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.android.gms.oss-licenses-plugin'
 
 android {
-    compileSdkVersion 30
+    compileSdk 33
     defaultConfig {
         applicationId "jp.atled.agileworks"
         minSdkVersion 24
-        targetSdkVersion 30
+        targetSdk 33
         versionCode 39
         versionName "1.0.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 640c0cf26a5a8f7aa06515f2c445dedcd208b161..f1ccc24c955107ce331712259446a1517f207703 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
         tools:ignore="GoogleAppIndexingWarning">
         <activity android:name=".view.ui.login.LoginActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|uiMode"
-            >
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -33,7 +33,8 @@
             android:launchMode="singleTop"
             android:theme="@style/AppTheme.NoActionBar">
         </activity>
-        <receiver android:name=".widget.AwAppWidget" android:label="@string/widget_label">
+        <receiver android:name=".widget.AwAppWidget" android:label="@string/widget_label"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="jp.atled.webview.ACTION_UPDATE" />
@@ -44,7 +45,8 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/aw_app_widget_info" />
         </receiver>
-        <receiver android:name=".widget.AwAppWidgetApproveOnly" android:label="@string/approve_only_widget_label">
+        <receiver android:name=".widget.AwAppWidgetApproveOnly" android:label="@string/approve_only_widget_label"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="jp.atled.webview.ACTION_UPDATE" />
@@ -56,7 +58,8 @@
                 android:resource="@xml/aw_app_widget_approveonly_info" />
         </receiver>
         <activity android:name="net.openid.appauth.RedirectUriReceiverActivity"
-            tools:node="replace">
+            tools:node="replace"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/app/src/main/java/jp/atled/agileworks/model/FcmRepository.kt b/app/src/main/java/jp/atled/agileworks/model/FcmRepository.kt
index 129c00b665254f16ea3c6ff4b77bc7384bd6580a..3b57b3bd96b0e3c4aeb5f43631eaab5275f00363 100644
--- a/app/src/main/java/jp/atled/agileworks/model/FcmRepository.kt
+++ b/app/src/main/java/jp/atled/agileworks/model/FcmRepository.kt
@@ -1,14 +1,15 @@
 package jp.atled.agileworks.model
 
 import android.os.AsyncTask
-import com.google.firebase.iid.FirebaseInstanceId
+import com.google.firebase.installations.FirebaseInstallations
+import com.google.firebase.messaging.FirebaseMessaging
 
 class FcmRepository {
     fun getFcmToken(onResponse: (isSuccess: Boolean, token: String?) -> Unit) {
-        FirebaseInstanceId.getInstance().instanceId.addOnCompleteListener { task ->
+        FirebaseMessaging.getInstance().token.addOnCompleteListener { task ->
             val result = task.result;
             if (task.isSuccessful && (result != null)) {
-                onResponse(true, result.token)
+                onResponse(true, result)
             } else {
                 onResponse(false, null)
             }
@@ -21,7 +22,9 @@ class FcmRepository {
 
     private class DeleteInstanceIdTask(private val onResponse: () -> Unit) : AsyncTask<Unit, Unit, Unit>() {
         override fun doInBackground(vararg params: Unit?) {
-            FirebaseInstanceId.getInstance().deleteInstanceId()
+            FirebaseInstallations.getInstance().delete()
+            FirebaseMessaging.getInstance().deleteToken()
+            //FirebaseInstanceId.getInstance().deleteInstanceId()
         }
 
         override fun onPostExecute(result: Unit?) {
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebDownload.kt b/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebDownload.kt
index 63f4605d45114b0ef3761b893df502e5fa13d75b..92c564e0090f33a3a8063bafb7332cabe96ad6bb 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebDownload.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebDownload.kt
@@ -140,7 +140,7 @@ class DocumentWebDownloader(private val handlingFragment: Fragment, private val
                         val openUriIntent = Intent(Intent.ACTION_VIEW, destinationUri).apply {
                             addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
                         }
-                        val pendingIntent = PendingIntent.getActivity(AwApp.instance.applicationContext, 0, openUriIntent, PendingIntent.FLAG_CANCEL_CURRENT)
+                        val pendingIntent = PendingIntent.getActivity(AwApp.instance.applicationContext, 0, openUriIntent, PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_CANCEL_CURRENT)
                         progressNotificationBuilder
                                 .setContentText(context.resources.getText(R.string.download_notification_successful_message))
                                 .setSmallIcon(android.R.drawable.stat_sys_download_done)
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt b/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt
index 16df17d684ee6f09c255c3614c70726a7f6ddbff..e461af141b7fcfe482a79cb0011f161a538a3746 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt
@@ -252,7 +252,7 @@ class DocumentWebFragment : Fragment(), DocumentWebPresenter {
             scrollAmount += scrollX - oldScrollX
         }
 
-        override fun onFling(e1: MotionEvent?, e2: MotionEvent?, velocityX: Float, velocityY: Float): Boolean {
+        override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
             // 横方向のスクロールが発生した時は基本的にページ遷移しないが、画面橋付近でページめくりをした時には反応するよう、短いスクロールは無視する。
             if (scrollAmount.absoluteValue > SCROLL_THRESHOLD) {
                 return false
@@ -306,7 +306,7 @@ class DocumentWebFragment : Fragment(), DocumentWebPresenter {
             return false
         }
         // ピンチが終わった際に閾値初期化
-        override fun onScaleEnd(detector: ScaleGestureDetector?) {
+        override fun onScaleEnd(detector: ScaleGestureDetector) {
             pinchThreshold = 0.0F
         }
 
@@ -351,7 +351,7 @@ class DocumentWebFragment : Fragment(), DocumentWebPresenter {
             it.setInitialScale(1)
             it.addJavascriptInterface(DocumentWebJavaScriptMessageReceiver(this, webShare), JAVASCRIPT_INTERFACE_NAME)
             val webSettings = it.settings
-            webSettings.setAppCacheEnabled(false)
+            //webSettings.setAppCacheEnabled(false)
             webSettings.builtInZoomControls = false
             webSettings.displayZoomControls = false
             webSettings.javaScriptEnabled = true
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
index 48aa9a611bbfc967312f56a2b88f44a1d0795363..9766cc1771a30598e03accb49869519c81db1764 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
@@ -18,7 +18,7 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import com.google.android.material.snackbar.Snackbar
-import com.google.firebase.iid.FirebaseInstanceId
+import com.google.firebase.messaging.FirebaseMessaging
 import jp.atled.agileworks.BuildConfig
 import jp.atled.agileworks.R
 import jp.atled.agileworks.AwApp
@@ -365,10 +365,10 @@ class LoginFragment: Fragment() {
             }
             if (response != null) {
                 // トークンの更新に成功したら、MainActivity を起動
-                FirebaseInstanceId.getInstance().instanceId.addOnCompleteListener { task ->
+                FirebaseMessaging.getInstance().token.addOnCompleteListener { task ->
                     if (task.isSuccessful) {
                         task.result?.apply {
-                            NotificationRepository().setToken(requireActivity(), token)
+                            NotificationRepository().setToken(requireActivity(), task.result!!)
                         }
                     } else {
                         Log.w(TAG, "getInstanceId failed", task.exception)
diff --git a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt
index 149c85f38b0747cc906c2f322534c6bac3f3fa2f..a66dd783f362d21aa652197fb66e63eb8108fbce 100644
--- a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt
+++ b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt
@@ -59,7 +59,7 @@ sealed class AwAppWidgetBase(private val widgetLayoutId: Int, private val approv
             val clickIntentTemplate = Intent(context, LoginActivity::class.java)
             val clickPendingIntentTemplate: PendingIntent = TaskStackBuilder.create(context)
                     .addNextIntentWithParentStack(clickIntentTemplate)
-                    .getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT)
+                    .getPendingIntent(0, PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
             views.setPendingIntentTemplate(R.id.widgetGridView, clickPendingIntentTemplate)
 
             appWidgetManager.updateAppWidget(appWidgetId, views)
diff --git a/app/src/main/java/jp/atled/agileworks/widget/AwFirebaseMessagingService.kt b/app/src/main/java/jp/atled/agileworks/widget/AwFirebaseMessagingService.kt
index 493f5ab68786cb6be39cd4fc70b6d42add19f2cd..0df3131a7afb49cc83e572b26958f139f9b7e784 100644
--- a/app/src/main/java/jp/atled/agileworks/widget/AwFirebaseMessagingService.kt
+++ b/app/src/main/java/jp/atled/agileworks/widget/AwFirebaseMessagingService.kt
@@ -74,7 +74,7 @@ class AwFirebaseMessagingService: FirebaseMessagingService() {
         }
         // 被り防止のために request code に notification id を用いる
         // FIXME: 低確率ながら firebase-messaging がバックグラウンドで表示するものと被る可能性あり
-        return PendingIntent.getActivity(this, notificationId, intent, PendingIntent.FLAG_CANCEL_CURRENT)
+        return PendingIntent.getActivity(this, notificationId, intent, PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_CANCEL_CURRENT)
     }
 
     /**
diff --git a/build.gradle b/build.gradle
index 977d62405d2d37460ed557d50d6173ed42a92e39..e5765d1e8571c8548b3e61fcf11e76663acb3bba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,14 +4,14 @@ buildscript {
     ext{
         kotlin_version = '1.4.10'
         nav_version = '2.3.2'
-        workVersion = '2.4.0'
+        workVersion = '2.7.0'
         anko_version = '0.10.8'
         retrofit_version = '2.8.1'
         coroutines_version = '1.3.7'
         moshi_version = '1.9.2'
         google_services_version='4.3.3'
         firebase_analytics_version = '18.0.0'
-        firebase_messaging_version = '21.0.0'
+        firebase_messaging_version = '23.0.0'
         constraint_layout_version = '2.0.4'
         appcompat_version = '1.3.0-alpha02'
         lifecycle_extention_version='1.1.1'