Merge pull request #31 from studyplus/update

Update libs, code, license

Author: koji-1009

.github/workflows/pr_check.yml

@@ -6,44 +6,24 @@ jobs:
   danger:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v2
 
-      - name: Bundler Cache
-        uses: actions/cache@v1.1.2
+      - uses: actions/cache@v2
         with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
-            ${{ runner.os }}-gems-
-      - name: Setup Ruby for use with actions
-        uses: actions/setup-ruby@v1.0.0
-        with:
-          ruby-version: '2.7'
-      - name: Install Danger
-        run: |
-          gem install bundler
-          bundle config set path 'vendor/bundle'
-          bundle config set clean 'true'
-          bundle check || bundle install --jobs 4 --retry 3
-
-      - name: Gradle dist Cache
-        uses: actions/cache@v1.1.2
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-dist-gradle-${{ hashFiles('**/gradle-wrapper.properties') }}
-      - name: Gradle dependencies Cache
-        uses: actions/cache@v1.1.2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-v1-gradle-${{ hashFiles('./build.gradle') }}-${{ hashFiles('**/build.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-v1-gradle-${{ hashFiles('./build.gradle') }}-
-            ${{ runner.os }}-v1-gradle-
+            ${{ runner.os }}-gradle-
       - name: Download Dependencies
         run: |
           ./gradlew androidDependencies --no-daemon
 
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7.2
+          bundler-cache: true
       - name: Run danger
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -52,21 +32,16 @@ jobs:
   unit_test:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v2
 
-      - name: Gradle dist Cache
-        uses: actions/cache@v1.1.2
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-dist-gradle-${{ hashFiles('**/gradle-wrapper.properties') }}
-      - name: Gradle dependencies Cache
-        uses: actions/cache@v1.1.2
+      - uses: actions/cache@v2
         with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-v1-gradle-${{ hashFiles('**/build.gradle') }}
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
-            ${{ runner.os }}-v1-gradle-
+            ${{ runner.os }}-gradle-
       - name: Download Dependencies
         run: |
           ./gradlew androidDependencies --no-daemon

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Studyplus, Inc.
+Copyright (c) 2021 Studyplus, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -94,14 +94,13 @@ Studyplus.instance.postRecord(this@MainActivity, record,
 ### More
 
 - See also [actual examples with Kotlin](https://github.com/studyplus/Studyplus-Android-SDK/blob/master/sdk-example-kt/src/main/java/jp/studyplus/android/sdk_example_kt/MainActivity.kt).
-- See also [actual examples with Java](https://github.com/studyplus/Studyplus-Android-SDK/blob/master/sdk-example-java/src/main/java/jp/studyplus/android/sdk_example_java/MainActivity.java).
 
 ### License
 
 ```text
 MIT License
 
-Copyright (c) 2020 Studyplus, Inc.
+Copyright (c) 2021 Studyplus, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build.gradle

@@ -2,24 +2,19 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.3.72'
+        kotlin_version = '1.4.30'
     }
     ext.versions = [
-            'compileSdk'      : 29,
-            'minSdk'          : 21,
-            'targetSdk'       : 29,
-            'annotation'      : '1.1.0',
-            'appcompat'       : '1.1.0',
-            'constraintLayout': '1.1.3',
-            'junit'           : '4.13',
-            'robolectric'     : '4.3.1'
+            'compileSdk': 29,
+            'minSdk'    : 21,
+            'targetSdk' : 29,
     ]
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -28,7 +23,6 @@ allprojects {
     repositories {
         google()
         jcenter()
-        maven { url 'https://jitpack.io' }
     }
 }
 

gradle.properties

@@ -15,7 +15,5 @@ org.gradle.jvmargs=-Xmx1536m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri May 29 10:30:00 JST 2020
+#Wed Feb 24 17:00:00 JST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip