Merge pull request #25 from MuShare/issue/24_myinfo_crash

Fix Crash for myinfo API
MuShare · Feb 8, 2024 · e0a96c0 · e0a96c0
2 parents 2245067 + 46d7f38
commit e0a96c0
Show file tree

Hide file tree

Showing 11 changed files with 214 additions and 151 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.9.22'
     repositories {
         google()
-        jcenter()
-
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -19,10 +18,10 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
diff --git a/demoapp/build.gradle b/demoapp/build.gradle
@@ -1,12 +1,8 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: "kotlin-kapt"
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -15,7 +11,8 @@ android {
     defaultConfig {
         applicationId "com.mushare.demoapp"
         minSdkVersion 19
-        targetSdkVersion 29
+        compileSdk 33
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
 

diff --git a/demoapp/src/main/AndroidManifest.xml b/demoapp/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
         android:theme="@style/AppTheme"
         android:requestLegacyExternalStorage="true">
         <activity
+            android:exported="true"
             android:name=".ui.login.LoginActivity"
             android:label="@string/app_name">
             <intent-filter>

diff --git a/demoapp/src/main/java/com/mushare/demoapp/ui/login/LoginActivity.kt b/demoapp/src/main/java/com/mushare/demoapp/ui/login/LoginActivity.kt
@@ -109,6 +109,7 @@ class LoginActivity : AppCompatActivity() {
                 Pluto.State.signIn -> {
                     startActivity(Intent(this, ProfileActivity::class.java))
                 }
+                else -> {}
             }
         })
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Mar 11 22:52:18 GMT+09:00 2020
+#Thu Feb 08 09:30:22 JST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip