Skip to content

pull #327

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

Open
hiennv95 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

pull #327

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
71a3de5
fix text
Sep 10, 2020
22351dd
androidx
Sep 10, 2020
55bed96
Merge branch 'jonasbark:master' into master
hiennv95 Aug 4, 2021
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
10 changes: 5 additions & 5 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ buildscript {
}

dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.70"
classpath 'com.android.tools.build:gradle:3.6.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0"
classpath 'com.android.tools.build:gradle:3.6.4'
}
}

Expand All @@ -28,14 +28,14 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 28
compileSdkVersion 30

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
defaultConfig {
minSdkVersion 16
targetSdkVersion 28
targetSdkVersion 30
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -68,7 +68,7 @@ android {
}

dependencies {
api 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.70'
api 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.71'
implementation 'androidx.annotation:annotation:1.1.0'
implementation 'com.stripe:stripe-android:16.10.0'
implementation 'com.android.support:appcompat-v7:28.0.0'
Expand Down
2 changes: 2 additions & 0 deletions android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536M
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
2 changes: 1 addition & 1 deletion android/src/main/res/layout/activity_stripe.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Save"
android:text="@string/save"
android:id="@+id/buttonSave"/>

<androidx.core.widget.ContentLoadingProgressBar
Expand Down
4 changes: 4 additions & 0 deletions android/src/main/res/values-ja/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="save">予約を確定する</string>
</resources>
4 changes: 4 additions & 0 deletions android/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="save">Save</string>
</resources>