Skip to content
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

Jump to bottom

Fix Crash for myinfo API #25

Merged
merged 3 commits into from
Feb 8, 2024
Merged

Fix Crash for myinfo API #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f79e2b
Update gradle to 7.3.3
yanyin1986 Feb 8, 2024
d8e2c0a
Fix crash when fetch myInfo API
yanyin1986 Feb 8, 2024
46d7f38
Up PlutoClientSDK version to 0.9.0(26)
yanyin1986 Feb 8, 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
11 changes: 5 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -19,10 +18,10 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

task clean(type: Delete) {
tasks.register('clean', Delete) {
delete rootProject.buildDir
}
7 changes: 2 additions & 5 deletions demoapp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -15,7 +11,8 @@ android {
defaultConfig {
applicationId "com.mushare.demoapp"
minSdkVersion 19
targetSdkVersion 29
compileSdk 33
targetSdkVersion 33
versionCode 1
versionName "1.0"

Expand Down
1 change: 1 addition & 0 deletions demoapp/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions demoapp/src/main/java/com/mushare/demoapp/ui/login/LoginActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ class LoginActivity : AppCompatActivity() {
Pluto.State.signIn -> {
startActivity(Intent(this, ProfileActivity::class.java))
}
else -> {}
}
})

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading
Loading