Skip to content

Commit e0a96c0

Browse files
authored
Merge pull request #25 from MuShare/issue/24_myinfo_crash
Fix Crash for myinfo API
2 parents 2245067 + 46d7f38 commit e0a96c0

File tree

11 files changed

+214
-151
lines changed

11 files changed

+214
-151
lines changed

build.gradle

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.3.72'
4+
ext.kotlin_version = '1.9.22'
55
repositories {
66
google()
7-
jcenter()
8-
7+
mavenCentral()
98
}
109
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.6.3'
10+
classpath 'com.android.tools.build:gradle:7.2.2'
1211
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1312

1413
// NOTE: Do not place your application dependencies here; they belong
@@ -19,10 +18,10 @@ buildscript {
1918
allprojects {
2019
repositories {
2120
google()
22-
jcenter()
21+
mavenCentral()
2322
}
2423
}
2524

26-
task clean(type: Delete) {
25+
tasks.register('clean', Delete) {
2726
delete rootProject.buildDir
2827
}

demoapp/build.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43
apply plugin: "kotlin-kapt"
54

65
android {
7-
compileSdkVersion 29
8-
buildToolsVersion "29.0.3"
9-
106
compileOptions {
117
sourceCompatibility JavaVersion.VERSION_1_8
128
targetCompatibility JavaVersion.VERSION_1_8
@@ -15,7 +11,8 @@ android {
1511
defaultConfig {
1612
applicationId "com.mushare.demoapp"
1713
minSdkVersion 19
18-
targetSdkVersion 29
14+
compileSdk 33
15+
targetSdkVersion 33
1916
versionCode 1
2017
versionName "1.0"
2118

demoapp/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
android:theme="@style/AppTheme"
1414
android:requestLegacyExternalStorage="true">
1515
<activity
16+
android:exported="true"
1617
android:name=".ui.login.LoginActivity"
1718
android:label="@string/app_name">
1819
<intent-filter>

demoapp/src/main/java/com/mushare/demoapp/ui/login/LoginActivity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ class LoginActivity : AppCompatActivity() {
109109
Pluto.State.signIn -> {
110110
startActivity(Intent(this, ProfileActivity::class.java))
111111
}
112+
else -> {}
112113
}
113114
})
114115

gradle/wrapper/gradle-wrapper.jar

5.08 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Mar 11 22:52:18 GMT+09:00 2020
1+
#Thu Feb 08 09:30:22 JST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

0 commit comments

Comments
 (0)