Skip to content

Commit

Permalink
Merge pull request #3 from tangem/feature/AND-7729-update-lib
Browse files Browse the repository at this point in the history
AND-7729 Update Lib
  • Loading branch information
MasterBin authored Jul 24, 2024
2 parents 1732918 + 2080115 commit f65f0b6
Show file tree
Hide file tree
Showing 182 changed files with 4,733 additions and 6,272 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
/.idea/other.xml
/.idea/codeStyles/Project.xml
/.idea/inspectionProfiles/Project_Default.xml
/.idea/studiobot.xml

*.iml
.gradle
Expand Down
4 changes: 3 additions & 1 deletion .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
[versions]
accompanist = "0.34.0"
activity = "1.9.0"
agp = "8.4.1"
agp = "8.5.1"
androidXAnnotation = "1.8.0"
androidXCore = "1.13.1"
appcompat = "1.7.0"
composeBom = "2024.05.00"
composeBom = "2024.06.00"
composeNavigation = "2.7.7"
composeStableMarker = "1.0.5"
coroutines = "1.8.1"
desugar_jdk_libs = "2.0.4"
dokka = "1.9.20"
jUnit = "4.13.2"
jUnitExt = "1.1.5"
jupiter = "5.10.2"
jupiter = "5.10.3"
kotlin = "2.0.0"
lifecycle = "2.8.1"
lifecycle = "2.8.3"
material = "1.12.0"
mockK = "1.13.11"
mockK = "1.13.12"
paparazziGradlePlugin = "1.3.4"
testCore = "1.5.0"
testCore = "1.6.1"

[libraries]
activityCompose = { group = "androidx.activity", name = "activity-compose", version.ref = "activity" }
Expand All @@ -32,6 +33,7 @@ composeMaterial = { group = "androidx.compose.material", name = "material" }
composeMaterial3 = { group = "androidx.compose.material3", name = "material3" }
composeNavigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "composeNavigation" }
composePreview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
composeStableMarker = { group = "com.github.skydoves", name = "compose-stable-marker", version.ref = "composeStableMarker" }
composeUI = { group = "androidx.compose.ui", name = "ui" }
composeUITooling = { group = "androidx.compose.ui", name = "ui-tooling" }
composeViewBinding = { group = "androidx.compose.ui", name = "ui-viewbinding" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@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 ##########################################################################
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit f65f0b6

Please sign in to comment.