Skip to content

Commit d11d206

Browse files
authored
Merge pull request #37 from studyplus/v4.0.0
v4.0.0
2 parents 9a083b8 + cbc27de commit d11d206

File tree

15 files changed

+299
-199
lines changed

15 files changed

+299
-199
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @studyplus/android
1+
* @studyplus/client

.github/workflows/pr_check.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ jobs:
66
danger:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v2
10-
9+
- uses: actions/checkout@v4
10+
- name: Setup Java
11+
uses: actions/setup-java@v3
12+
with:
13+
distribution: 'temurin'
14+
java-version: '17'
1115
- uses: actions/cache@v2
1216
with:
1317
path: |
@@ -22,7 +26,7 @@ jobs:
2226
2327
- uses: ruby/setup-ruby@v1
2428
with:
25-
ruby-version: 2.7.2
29+
ruby-version: 3.1
2630
bundler-cache: true
2731
- name: Run danger
2832
env:
@@ -32,8 +36,12 @@ jobs:
3236
unit_test:
3337
runs-on: ubuntu-latest
3438
steps:
35-
- uses: actions/checkout@v2
36-
39+
- uses: actions/checkout@v4
40+
- name: Setup Java
41+
uses: actions/setup-java@v3
42+
with:
43+
distribution: 'temurin'
44+
java-version: '17'
3745
- uses: actions/cache@v2
3846
with:
3947
path: |

.github/workflows/unit_test.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@ jobs:
99
unit_test:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
13-
12+
- uses: actions/checkout@v4
13+
- name: Setup Java
14+
uses: actions/setup-java@v3
15+
with:
16+
distribution: 'temurin'
17+
java-version: '17'
1418
- uses: actions/cache@v2
1519
with:
1620
path: |

Dangerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ warn("A pull request must have some assignees") if github.pr_json["assignee"].ni
2828
# Android Lint
2929
#
3030
####
31-
android_lint.gradle_task = "studyplus-android-sdk:lint"
32-
android_lint.report_file = "studyplus-android-sdk/build/reports/lint-results.xml"
31+
android_lint.gradle_task = "studyplus-android-sdk:lintDebug"
32+
android_lint.report_file = "studyplus-android-sdk/build/reports/lint-results-debug.xml"
3333
android_lint.filtering = true
3434
android_lint.lint(inline_mode: true)

Gemfile.lock

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,73 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.7.0)
5-
public_suffix (>= 2.0.2, < 5.0)
4+
addressable (2.8.6)
5+
public_suffix (>= 2.0.2, < 6.0)
66
ansi (1.5.0)
77
ast (2.4.2)
8-
claide (1.0.3)
8+
base64 (0.2.0)
9+
claide (1.1.0)
910
claide-plugins (0.9.2)
1011
cork
1112
nap
1213
open4 (~> 1.3)
1314
colored2 (3.1.2)
1415
cork (0.3.0)
1516
colored2 (~> 3.1)
16-
danger (8.2.3)
17+
danger (9.4.1)
1718
claide (~> 1.0)
1819
claide-plugins (>= 0.9.2)
1920
colored2 (~> 3.1)
2021
cork (~> 0.1)
21-
faraday (>= 0.9.0, < 2.0)
22+
faraday (>= 0.9.0, < 3.0)
2223
faraday-http-cache (~> 2.0)
23-
git (~> 1.7)
24+
git (~> 1.13)
2425
kramdown (~> 2.3)
2526
kramdown-parser-gfm (~> 1.0)
2627
no_proxy_fix
27-
octokit (~> 4.7)
28+
octokit (>= 6.0)
2829
terminal-table (>= 1, < 4)
29-
danger-android_lint (0.0.8)
30+
danger-android_lint (0.0.12)
3031
danger-plugin-api (~> 1.0)
3132
oga
3233
danger-plugin-api (1.0.0)
3334
danger (> 2.0)
34-
faraday (1.3.0)
35-
faraday-net_http (~> 1.0)
36-
multipart-post (>= 1.2, < 3)
37-
ruby2_keywords
38-
faraday-http-cache (2.2.0)
35+
faraday (2.7.12)
36+
base64
37+
faraday-net_http (>= 2.0, < 3.1)
38+
ruby2_keywords (>= 0.0.4)
39+
faraday-http-cache (2.5.0)
3940
faraday (>= 0.8)
40-
faraday-net_http (1.0.1)
41-
git (1.8.1)
41+
faraday-net_http (3.0.2)
42+
git (1.18.0)
43+
addressable (~> 2.8)
4244
rchardet (~> 1.8)
43-
kramdown (2.3.0)
45+
kramdown (2.4.0)
4446
rexml
4547
kramdown-parser-gfm (1.1.0)
4648
kramdown (~> 2.0)
47-
multipart-post (2.1.1)
4849
nap (1.1.0)
4950
no_proxy_fix (0.1.2)
50-
octokit (4.20.0)
51-
faraday (>= 0.9)
52-
sawyer (~> 0.8.0, >= 0.5.3)
53-
oga (3.3)
51+
octokit (8.0.0)
52+
faraday (>= 1, < 3)
53+
sawyer (~> 0.9)
54+
oga (3.4)
5455
ast
5556
ruby-ll (~> 2.1)
5657
open4 (1.3.4)
57-
public_suffix (4.0.6)
58+
public_suffix (5.0.4)
5859
rchardet (1.8.0)
59-
rexml (3.2.4)
60-
ruby-ll (2.1.2)
60+
rexml (3.2.6)
61+
ruby-ll (2.1.3)
6162
ansi
6263
ast
63-
ruby2_keywords (0.0.4)
64-
sawyer (0.8.2)
64+
ruby2_keywords (0.0.5)
65+
sawyer (0.9.2)
6566
addressable (>= 2.3.5)
66-
faraday (> 0.8, < 2.0)
67-
terminal-table (3.0.0)
68-
unicode-display_width (~> 1.1, >= 1.1.1)
69-
unicode-display_width (1.7.0)
67+
faraday (>= 0.17.3, < 3)
68+
terminal-table (3.0.2)
69+
unicode-display_width (>= 1.1.1, < 3)
70+
unicode-display_width (2.5.0)
7071

7172
PLATFORMS
7273
ruby
@@ -76,4 +77,4 @@ DEPENDENCIES
7677
danger-android_lint
7778

7879
BUNDLED WITH
79-
2.1.4
80+
2.3.7

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
## Requirements
77

8-
- Android 5+
9-
- [Studyplus App 5.0.+](https://play.google.com/store/apps/details?id=jp.studyplus.android.app)
8+
- Android 6+
9+
- [Studyplus App 7.0.+](https://play.google.com/store/apps/details?id=jp.studyplus.android.app)
1010

1111
## Import in your Project
1212

@@ -24,7 +24,7 @@ allprojects {
2424

2525
```groovy
2626
dependencies {
27-
implementation 'com.github.studyplus:Studyplus-Android-SDK:3.0.0'
27+
implementation 'com.github.studyplus:Studyplus-Android-SDK:4.0.0'
2828
}
2929
```
3030

build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,30 @@
22

33
buildscript {
44
ext {
5-
kotlin_version = '1.4.31'
5+
kotlin_version = '1.8.22'
66
}
77
ext.versions = [
8-
'compileSdk': 30,
9-
'minSdk' : 21,
10-
'targetSdk' : 30,
8+
'compileSdk': 34,
9+
'minSdk' : 23,
10+
'targetSdk' : 34,
1111
]
1212
repositories {
1313
google()
14-
jcenter()
14+
mavenCentral()
1515
}
1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:4.1.2'
17+
classpath 'com.android.tools.build:gradle:8.2.0'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
}
2020
}
2121

2222
allprojects {
2323
repositories {
2424
google()
25-
jcenter()
25+
mavenCentral()
2626
}
2727
}
2828

29-
task clean(type: Delete) {
29+
tasks.register('clean', Delete) {
3030
delete rootProject.buildDir
3131
}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Wed Feb 24 17:00:00 JST 2021
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

0 commit comments

Comments
 (0)