From d188fb50b52ff6619c68ff02b3c14a9ec28b8c88 Mon Sep 17 00:00:00 2001
From: CHIBA Tairi <31642509+pakutoma@users.noreply.github.com>
Date: Sun, 4 Oct 2020 16:21:58 +0900
Subject: [PATCH] =?UTF-8?q?release:=202.3=E3=83=AA=E3=83=AA=E3=83=BC?=
=?UTF-8?q?=E3=82=B9=20(#40)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Fix: 従量制プランに対応 (#39)
* chore: リリース準備
---
.idea/gradle.xml | 2 ++
.idea/misc.xml | 2 +-
.idea/modules.xml | 2 ++
app/build.gradle | 10 +++++-----
app/src/main/assets/about.html | 4 ++--
.../pakutoma/iijmiocouponwidget/utility/CouponAPI.kt | 2 +-
6 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7ac24c7..5cd135a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,8 +1,10 @@
+
-
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 90879b2..30b162f 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,10 @@
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 392272d..a69bdff 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
android {
- compileSdkVersion 28
- buildToolsVersion '28.0.3'
+ compileSdkVersion 30
+ buildToolsVersion '30.0.1'
defaultConfig {
applicationId "pakutoma.iijmiocouponwidget"
minSdkVersion 21
- versionCode 6
- versionName "2.2"
- targetSdkVersion 28
+ versionCode 7
+ versionName "2.3"
+ targetSdkVersion 30
}
buildTypes {
release {
diff --git a/app/src/main/assets/about.html b/app/src/main/assets/about.html
index 0599b15..d3cc3e1 100644
--- a/app/src/main/assets/about.html
+++ b/app/src/main/assets/about.html
@@ -1,7 +1,7 @@
-mioWidget 2.2
-Copyright (c) 2019 @pakutoma
+mioWidget 2.3
+Copyright (c) 2020 @pakutoma
\ No newline at end of file
diff --git a/app/src/main/java/pakutoma/iijmiocouponwidget/utility/CouponAPI.kt b/app/src/main/java/pakutoma/iijmiocouponwidget/utility/CouponAPI.kt
index 6151b3b..c9fef0d 100644
--- a/app/src/main/java/pakutoma/iijmiocouponwidget/utility/CouponAPI.kt
+++ b/app/src/main/java/pakutoma/iijmiocouponwidget/utility/CouponAPI.kt
@@ -94,7 +94,7 @@ class CouponAPI constructor(developerID: String, accessToken: String) {
when (it.plan) {
"Family Share", "Minimum Start", "Light Start"
-> convertNormalData(it)
- "Eco Minimum", "Eco Standard"
+ "Eco Minimum", "Eco Standard", "Pay as you go"
-> convertEcoData(it)
else
-> throw UndefinedPlanException("Undefined plan name")