Skip to content

Commit

Permalink
Merge pull request #113 from KakaoCup/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
Vacxe authored Jan 9, 2024
2 parents 7c29bb7 + 92fad75 commit 32cd37a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ General Workflow

The steps below describe how to get a patch into a master branch.

1. Find an open issue or create a new issue on [issue tracker](https://github.com/agoda-com/kakao/issues) for the work you want to
1. Find an open issue or create a new issue on [issue tracker](https://github.com/KakaoCup/Kakao/issues) for the work you want to
contribute. In case you wish to work on an existing issue make sure no one else is working on it. Comment on the issue declaring you are
willing to take it up to avoid possible conflicts and reworks. Also avoid picking up issues tagged as Invalid.
2. [Fork the project](https://github.com/agoda-com/kakao#fork-destination-box) on GitHub. You'll need to create a feature-branch for your
2. [Fork the project](https://github.com/KakaoCup/Kakao/issues#fork-destination-box) on GitHub. You'll need to create a feature-branch for your
work on your fork, as this way you'll be able to submit a pull request against Kakao.
3. Continue working on the feature branch until you are satisfied. Add tests for new features and modify existing tests if required.
4. Run all unit tests from sbt and make sure all of them pass.
Expand Down
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
[versions]
gradle = "8.1"
gradle = "8.5"
jvmVersion = "17"

targetSdk = "34"
compileSdk = "34"
minSdk = "14"

agpVersion = "8.1.4"
kotlinVersion = "1.9.20"
agpVersion = "8.2.1"
kotlinVersion = "1.9.21"

dokkaVersion = "1.9.10"
appcompatVersion = "1.6.1"
recyclerviewVersion = "1.3.2"
viewPager2Version = "1.0.0"
swiperefreshlayoutVersion = "1.1.0"
annotationVersion = "1.2.0"
annotationVersion = "1.3.0"
testRunnerVersion = "1.5.2"
testRulesVersion = "1.5.0"

Expand All @@ -23,11 +23,11 @@ espressoVersion = "3.5.1"
junitVersion = "4.13.2"
junitExtVersion = "1.1.5"
multidexVersion = "2.0.1"
materialVersion = "1.10.0"
materialVersion = "1.11.0"

detekt = "1.17.1"

githubApiVersion = "1.129"
githubApiVersion = "1.318"

[libraries]
com-android-tools-build-gradle = { group = "com.android.tools.build", name = "gradle", version.ref = "agpVersion" }
Expand Down
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.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 32cd37a

Please sign in to comment.