Merge pull request #37 from studyplus/v4.0.0

v4.0.0
studyplus · Dec 13, 2023 · d11d206 · d11d206
2 parents 9a083b8 + cbc27de
commit d11d206
Show file tree

Hide file tree

Showing 15 changed files with 299 additions and 199 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @studyplus/android
+* @studyplus/client
diff --git a/.github/workflows/pr_check.yml b/.github/workflows/pr_check.yml
@@ -6,8 +6,12 @@ jobs:
   danger:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-
+      - uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
       - uses: actions/cache@v2
         with:
           path: |
@@ -22,7 +26,7 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.2
+          ruby-version: 3.1
           bundler-cache: true
       - name: Run danger
         env:
@@ -32,8 +36,12 @@ jobs:
   unit_test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-
+      - uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
       - uses: actions/cache@v2
         with:
           path: |

diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
@@ -9,8 +9,12 @@ jobs:
   unit_test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-
+      - uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
       - uses: actions/cache@v2
         with:
           path: |

diff --git a/Dangerfile b/Dangerfile
@@ -28,7 +28,7 @@ warn("A pull request must have some assignees") if github.pr_json["assignee"].ni
 # Android Lint
 #
 ####
-android_lint.gradle_task = "studyplus-android-sdk:lint"
-android_lint.report_file = "studyplus-android-sdk/build/reports/lint-results.xml"
+android_lint.gradle_task = "studyplus-android-sdk:lintDebug"
+android_lint.report_file = "studyplus-android-sdk/build/reports/lint-results-debug.xml"
 android_lint.filtering = true
 android_lint.lint(inline_mode: true)
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,72 +1,73 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
     ansi (1.5.0)
     ast (2.4.2)
-    claide (1.0.3)
+    base64 (0.2.0)
+    claide (1.1.0)
     claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (8.2.3)
+    danger (9.4.1)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
-      faraday (>= 0.9.0, < 2.0)
+      faraday (>= 0.9.0, < 3.0)
       faraday-http-cache (~> 2.0)
-      git (~> 1.7)
+      git (~> 1.13)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
-      octokit (~> 4.7)
+      octokit (>= 6.0)
       terminal-table (>= 1, < 4)
-    danger-android_lint (0.0.8)
+    danger-android_lint (0.0.12)
       danger-plugin-api (~> 1.0)
       oga
     danger-plugin-api (1.0.0)
       danger (> 2.0)
-    faraday (1.3.0)
-      faraday-net_http (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords
-    faraday-http-cache (2.2.0)
+    faraday (2.7.12)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-http-cache (2.5.0)
       faraday (>= 0.8)
-    faraday-net_http (1.0.1)
-    git (1.8.1)
+    faraday-net_http (3.0.2)
+    git (1.18.0)
+      addressable (~> 2.8)
       rchardet (~> 1.8)
-    kramdown (2.3.0)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    multipart-post (2.1.1)
     nap (1.1.0)
     no_proxy_fix (0.1.2)
-    octokit (4.20.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    oga (3.3)
+    octokit (8.0.0)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    oga (3.4)
       ast
       ruby-ll (~> 2.1)
     open4 (1.3.4)
-    public_suffix (4.0.6)
+    public_suffix (5.0.4)
     rchardet (1.8.0)
-    rexml (3.2.4)
-    ruby-ll (2.1.2)
+    rexml (3.2.6)
+    ruby-ll (2.1.3)
       ansi
       ast
-    ruby2_keywords (0.0.4)
-    sawyer (0.8.2)
+    ruby2_keywords (0.0.5)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    terminal-table (3.0.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.7.0)
+      faraday (>= 0.17.3, < 3)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby
@@ -76,4 +77,4 @@ DEPENDENCIES
   danger-android_lint
 
 BUNDLED WITH
-   2.1.4
+   2.3.7
diff --git a/README.md b/README.md
@@ -5,8 +5,8 @@
 
 ## Requirements
 
-- Android 5+
-- [Studyplus App 5.0.+](https://play.google.com/store/apps/details?id=jp.studyplus.android.app)
+- Android 6+
+- [Studyplus App 7.0.+](https://play.google.com/store/apps/details?id=jp.studyplus.android.app)
 
 ## Import in your Project
 
@@ -24,7 +24,7 @@ allprojects {
 
 ```groovy
 dependencies {
-    implementation 'com.github.studyplus:Studyplus-Android-SDK:3.0.0'
+    implementation 'com.github.studyplus:Studyplus-Android-SDK:4.0.0'
 }
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -2,30 +2,30 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.4.31'
+        kotlin_version = '1.8.22'
     }
     ext.versions = [
-            'compileSdk': 30,
-            'minSdk'    : 21,
-            'targetSdk' : 30,
+            'compileSdk': 34,
+            'minSdk'    : 23,
+            'targetSdk' : 34,
     ]
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:8.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Feb 24 17:00:00 JST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip