diff --git a/.gitignore b/.gitignore index 1257d10..73f41ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.kotlin # User-specific stuff .idea/**/workspace.xml .idea/**/tasks.xml diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml new file mode 100644 index 0000000..4a53bee --- /dev/null +++ b/.idea/AndroidProjectSystem.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/caches/deviceStreaming.xml b/.idea/caches/deviceStreaming.xml new file mode 100644 index 0000000..6204c44 --- /dev/null +++ b/.idea/caches/deviceStreaming.xml @@ -0,0 +1,751 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index d3fc6f3..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..16660f1 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/amplifyframework/build.gradle.kts b/amplifyframework/build.gradle.kts index ab86936..0e6d031 100644 --- a/amplifyframework/build.gradle.kts +++ b/amplifyframework/build.gradle.kts @@ -1,8 +1,8 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask plugins { - kotlin("multiplatform") - id("com.android.library") + alias(libs.plugins.kotlin.multiplatform) + alias(libs.plugins.android.library) id("maven-publish") } @@ -28,15 +28,15 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation("org.jetbrains:annotations:24.1.0") - implementation("com.ionspin.kotlin:bignum:0.3.8") - implementation("org.kotlincrypto:secure-random:0.1.0") - implementation(platform("org.kotlincrypto.macs:bom:0.3.0")) - implementation("org.kotlincrypto.macs:hmac-sha2") - implementation(platform("org.kotlincrypto.hash:bom:0.3.0")) - implementation("org.kotlincrypto.hash:sha2") - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1") - implementation("io.ktor:ktor-client-core:2.3.6") + implementation(libs.jetbrainsAnnotations) + implementation(libs.bignum) + implementation(kotlincrypto.random.secure) + implementation(platform(kotlincrypto.macs.bom)) + implementation(kotlincrypto.macs.hmac.sha2) + implementation(platform(kotlincrypto.hash.bom)) + implementation(kotlincrypto.hash.sha2) + implementation(libs.kotlinx.datetime) + implementation(libs.ktor.client.core) } } val commonTest by getting { @@ -49,9 +49,9 @@ kotlin { android { namespace = "com.jump.sdk.amplifyframework" - compileSdk = 34 + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = 26 + minSdk = libs.versions.minSdk.get().toInt() } compileOptions { sourceCompatibility = JavaVersion.VERSION_17 diff --git a/build.gradle.kts b/build.gradle.kts index b618f18..097ef1c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,8 @@ plugins { - id("com.android.library").version("8.2.0-rc03").apply(false) - kotlin("multiplatform").version("1.9.20").apply(false) - id("io.gitlab.arturbosch.detekt") version "1.23.3" - id("com.github.ben-manes.versions") version "0.50.0" + alias(libs.plugins.android.library).apply(false) + alias(libs.plugins.kotlin.multiplatform).apply(false) + alias(libs.plugins.detekt) + alias(libs.plugins.benManes.versions) } tasks.register("clean", Delete::class) { @@ -14,11 +14,6 @@ allprojects { google() mavenCentral() gradlePluginPortal() - maven("https://jitpack.io") { - content { - includeGroup("com.github.hbmartin") - } - } } apply(plugin = "io.gitlab.arturbosch.detekt") detekt { @@ -33,10 +28,9 @@ allprojects { } } dependencies { - val detektVersion = "1.23.3" - detektPlugins("io.gitlab.arturbosch.detekt:detekt-rules-libraries:$detektVersion") - detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:$detektVersion") - detektPlugins("com.braisgabin.detekt:kotlin-compiler-wrapper:0.0.4") - detektPlugins("com.github.hbmartin:hbmartin-detekt-rules:0.1.3") + detektPlugins(libs.detekt.libraries) + detektPlugins(libs.detekt.formatting) + detektPlugins(libs.detekt.kotlinCompilerWrapper) + detektPlugins(libs.detekt.hbmartin) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..29caeec --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,29 @@ +[versions] +agp = "8.10.0" +kotlin = "2.1.21" +detekt = "1.23.8" +hbmartinRules = "0.1.7" +jbAnnotations = "26.0.2" +bignum = "0.3.10" +kotlinxDatetime = "0.4.1" +ktor = "2.3.6" +benManesVersions = "0.52.0" +kotlinCompilerWrapper = "0.0.4" +compileSdk = "34" +minSdk = "26" + +[libraries] +detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" } +detekt-libraries = { group = "io.gitlab.arturbosch.detekt", name = "detekt-rules-libraries", version.ref = "detekt" } +detekt-hbmartin = { group = "me.haroldmartin", name = "hbmartin-detekt-rules", version.ref = "hbmartinRules" } +detekt-kotlinCompilerWrapper = { group = "com.braisgabin.detekt", name = "kotlin-compiler-wrapper", version.ref = "kotlinCompilerWrapper" } +jetbrainsAnnotations = { group = "org.jetbrains", name = "annotations", version.ref = "jbAnnotations" } +bignum = { group = "com.ionspin.kotlin", name = "bignum", version.ref = "bignum" } +kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinxDatetime" } +ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" } + +[plugins] +android-library = { id = "com.android.library", version.ref = "agp" } +kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } +detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } +benManes-versions = { id = "com.github.ben-manes.versions", version.ref = "benManesVersions" } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 033e24c..1b33c55 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9f4197d..e2847c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index fcb6fca..23d15a9 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -83,7 +85,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -111,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -144,7 +147,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +155,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -201,16 +204,16 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# 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. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..5eed7ee --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +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="-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% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts index e45befe..1a02bef 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,6 +7,14 @@ pluginManagement { } dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("gradle/libs.versions.toml")) + } + create("kotlincrypto") { + from("org.kotlincrypto:version-catalog:0.7.1") + } + } repositories { google() mavenCentral()