From 4526de1ee1cd7792212ec4aa81d2254764a10639 Mon Sep 17 00:00:00 2001 From: suyama Date: Tue, 12 Dec 2023 11:19:18 +0900 Subject: [PATCH 01/13] upgrade AGP --- build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 282 +++++++++++------- gradlew.bat | 43 +-- sdk-example-kt/build.gradle | 2 + sdk-example-kt/src/main/AndroidManifest.xml | 3 +- studyplus-android-sdk/build.gradle | 9 +- .../src/debug/AndroidManifest.xml | 3 +- .../src/main/AndroidManifest.xml | 3 +- 9 files changed, 210 insertions(+), 142 deletions(-) diff --git a/build.gradle b/build.gradle index ed8b0ac..4d0c2f3 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { - kotlin_version = '1.4.31' + kotlin_version = '1.6.21' } ext.versions = [ 'compileSdk': 30, @@ -14,7 +14,7 @@ buildscript { jcenter() } 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" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 94f9ac0..15de902 100644 --- 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 diff --git a/gradlew b/gradlew index cccdd3d..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index e95643d..ac1b06f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/sdk-example-kt/build.gradle b/sdk-example-kt/build.gradle index 60f0f19..ef4759d 100644 --- a/sdk-example-kt/build.gradle +++ b/sdk-example-kt/build.gradle @@ -2,6 +2,8 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { + namespace 'jp.studyplus.android.sdk_example_kt' + compileSdkVersion versions.compileSdk buildFeatures { diff --git a/sdk-example-kt/src/main/AndroidManifest.xml b/sdk-example-kt/src/main/AndroidManifest.xml index 878c911..2e530e9 100644 --- a/sdk-example-kt/src/main/AndroidManifest.xml +++ b/sdk-example-kt/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + diff --git a/studyplus-android-sdk/src/main/AndroidManifest.xml b/studyplus-android-sdk/src/main/AndroidManifest.xml index cfb2cf6..57a5fef 100644 --- a/studyplus-android-sdk/src/main/AndroidManifest.xml +++ b/studyplus-android-sdk/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + From 1d9c699c2b8d04ba59a3263fdb1bdecc6aa9af21 Mon Sep 17 00:00:00 2001 From: suyama Date: Tue, 12 Dec 2023 11:25:51 +0900 Subject: [PATCH 02/13] add buildconfig --- studyplus-android-sdk/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/studyplus-android-sdk/build.gradle b/studyplus-android-sdk/build.gradle index d8ab681..4f2dded 100644 --- a/studyplus-android-sdk/build.gradle +++ b/studyplus-android-sdk/build.gradle @@ -5,6 +5,11 @@ android { namespace 'jp.studyplus.android.sdk' compileSdkVersion versions.compileSdk + + buildFeatures { + buildConfig true + } + defaultConfig { minSdkVersion versions.minSdk targetSdkVersion versions.targetSdk From 00f86cb4c52ea828f6f83470fcd7c311cf59f613 Mon Sep 17 00:00:00 2001 From: suyama Date: Tue, 12 Dec 2023 11:40:05 +0900 Subject: [PATCH 03/13] update compileSdk minSdk --- build.gradle | 12 ++++++------ sdk-example-kt/build.gradle | 4 ++++ sdk-example-kt/src/main/AndroidManifest.xml | 4 +++- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 4d0c2f3..3c2de26 100644 --- a/build.gradle +++ b/build.gradle @@ -5,13 +5,13 @@ buildscript { kotlin_version = '1.6.21' } 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:8.2.0' @@ -22,10 +22,10 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/sdk-example-kt/build.gradle b/sdk-example-kt/build.gradle index ef4759d..b9ea417 100644 --- a/sdk-example-kt/build.gradle +++ b/sdk-example-kt/build.gradle @@ -29,12 +29,16 @@ android { } compileOptions { + coreLibraryDesugaringEnabled true + sourceCompatibility = 1.8 targetCompatibility = 1.8 } } dependencies { + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' + implementation project(":studyplus-android-sdk") implementation "androidx.appcompat:appcompat:1.2.0" diff --git a/sdk-example-kt/src/main/AndroidManifest.xml b/sdk-example-kt/src/main/AndroidManifest.xml index 2e530e9..2faa844 100644 --- a/sdk-example-kt/src/main/AndroidManifest.xml +++ b/sdk-example-kt/src/main/AndroidManifest.xml @@ -8,7 +8,9 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + From ed3ee8b2574bce635330e45cae7571e55ee1de0e Mon Sep 17 00:00:00 2001 From: suyama Date: Tue, 12 Dec 2023 12:13:37 +0900 Subject: [PATCH 04/13] update libraries --- build.gradle | 2 +- sdk-example-kt/build.gradle | 10 +++++++--- studyplus-android-sdk/build.gradle | 10 +++++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 3c2de26..630127a 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { - kotlin_version = '1.6.21' + kotlin_version = '1.8.22' } ext.versions = [ 'compileSdk': 34, diff --git a/sdk-example-kt/build.gradle b/sdk-example-kt/build.gradle index b9ea417..7dc4d0f 100644 --- a/sdk-example-kt/build.gradle +++ b/sdk-example-kt/build.gradle @@ -34,13 +34,17 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } + + kotlinOptions { + jvmTarget = "1.8" + } } dependencies { - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4' implementation project(":studyplus-android-sdk") - implementation "androidx.appcompat:appcompat:1.2.0" - implementation "androidx.constraintlayout:constraintlayout:2.0.4" + implementation "androidx.appcompat:appcompat:1.6.1" + implementation "androidx.constraintlayout:constraintlayout:2.1.4" } diff --git a/studyplus-android-sdk/build.gradle b/studyplus-android-sdk/build.gradle index 4f2dded..2ea7157 100644 --- a/studyplus-android-sdk/build.gradle +++ b/studyplus-android-sdk/build.gradle @@ -40,17 +40,21 @@ android { targetCompatibility = 1.8 } + kotlinOptions { + jvmTarget = "1.8" + } + lint { abortOnError false } } dependencies { - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4' - implementation "androidx.annotation:annotation:1.1.0" + implementation "androidx.annotation:annotation:1.7.0" - implementation platform("com.squareup.okhttp3:okhttp-bom:4.9.1") + implementation platform("com.squareup.okhttp3:okhttp-bom:4.12.0") implementation "com.squareup.okhttp3:okhttp" testImplementation "junit:junit:4.13.2" From 730b80ed9e6f02cb9309a9b52c7c26f1fcb86be1 Mon Sep 17 00:00:00 2001 From: suyama Date: Tue, 12 Dec 2023 12:16:10 +0900 Subject: [PATCH 05/13] fix README --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1330e28..4153abf 100644 --- 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' } ``` From 2b6da13ceb095958395db9e703e95241134c5e6c Mon Sep 17 00:00:00 2001 From: suyama Date: Tue, 12 Dec 2023 16:01:47 +0900 Subject: [PATCH 06/13] setup java17 --- .github/workflows/pr_check.yml | 6 +++++- .github/workflows/unit_test.yml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr_check.yml b/.github/workflows/pr_check.yml index d5645ca..8507fc3 100644 --- a/.github/workflows/pr_check.yml +++ b/.github/workflows/pr_check.yml @@ -33,7 +33,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - + - 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 index a6ab58e..1579bab 100644 --- a/.github/workflows/unit_test.yml +++ b/.github/workflows/unit_test.yml @@ -10,7 +10,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - + - name: Setup Java + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' - uses: actions/cache@v2 with: path: | From 68e97261a16390ed8fcd62e7e0c0b79ec61b695b Mon Sep 17 00:00:00 2001 From: suyama Date: Tue, 12 Dec 2023 17:21:57 +0900 Subject: [PATCH 07/13] setup java17 --- .github/workflows/pr_check.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr_check.yml b/.github/workflows/pr_check.yml index 8507fc3..d29963b 100644 --- a/.github/workflows/pr_check.yml +++ b/.github/workflows/pr_check.yml @@ -7,7 +7,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - + - name: Setup Java + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' - uses: actions/cache@v2 with: path: | From 506dd14bdfe5e0f1c14b5cbd526d144257428715 Mon Sep 17 00:00:00 2001 From: suyama Date: Tue, 12 Dec 2023 17:22:08 +0900 Subject: [PATCH 08/13] update robolectric --- studyplus-android-sdk/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/studyplus-android-sdk/build.gradle b/studyplus-android-sdk/build.gradle index 2ea7157..a4bf0d3 100644 --- a/studyplus-android-sdk/build.gradle +++ b/studyplus-android-sdk/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation "com.squareup.okhttp3:okhttp" testImplementation "junit:junit:4.13.2" - testImplementation "org.robolectric:robolectric:4.5.1" + testImplementation 'org.robolectric:robolectric:4.11.1' testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version" testImplementation "com.squareup.okhttp3:mockwebserver" } From 14c8da8b0fa24b86c5987b471d1aa12df193a6c8 Mon Sep 17 00:00:00 2001 From: suyama Date: Tue, 12 Dec 2023 17:27:48 +0900 Subject: [PATCH 09/13] bundle update --- Gemfile.lock | 63 ++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index bd5cb99..703c69b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,12 @@ 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 @@ -13,60 +14,60 @@ GEM 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 From 589876db5f8816cab0a06507d39a1e90c6892a18 Mon Sep 17 00:00:00 2001 From: suyama Date: Tue, 12 Dec 2023 17:41:54 +0900 Subject: [PATCH 10/13] update ruby --- .github/workflows/pr_check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_check.yml b/.github/workflows/pr_check.yml index d29963b..ca755e7 100644 --- a/.github/workflows/pr_check.yml +++ b/.github/workflows/pr_check.yml @@ -26,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: From e4f5add6b7cfc950db92eddf1ce8b3fdb1a9da50 Mon Sep 17 00:00:00 2001 From: suyama Date: Tue, 12 Dec 2023 17:46:05 +0900 Subject: [PATCH 11/13] change lintDebug --- Dangerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dangerfile b/Dangerfile index c48fc04..5389f81 100644 --- 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) \ No newline at end of file From 3e83fe2c9d967e5d0a283a575f5d39a4c1b0177e Mon Sep 17 00:00:00 2001 From: suyama Date: Tue, 12 Dec 2023 18:49:59 +0900 Subject: [PATCH 12/13] checkout v4 --- .github/workflows/pr_check.yml | 4 ++-- .github/workflows/unit_test.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr_check.yml b/.github/workflows/pr_check.yml index ca755e7..3790267 100644 --- a/.github/workflows/pr_check.yml +++ b/.github/workflows/pr_check.yml @@ -6,7 +6,7 @@ jobs: danger: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup Java uses: actions/setup-java@v3 with: @@ -36,7 +36,7 @@ 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: diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml index 1579bab..bf69119 100644 --- a/.github/workflows/unit_test.yml +++ b/.github/workflows/unit_test.yml @@ -9,7 +9,7 @@ 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: From cbc27deec4cc6ad97a415cfa337c5063cbf9c15f Mon Sep 17 00:00:00 2001 From: suyama Date: Wed, 13 Dec 2023 16:59:04 +0900 Subject: [PATCH 13/13] =?UTF-8?q?CODEOWNERS=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index bb05e66..95571f6 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @studyplus/android +* @studyplus/client