Skip to content

Commit

Permalink
Merge branch 'parse-community:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
rommansabbir authored Aug 6, 2024
2 parents ec87160 + a08c5d1 commit 4653c28
Show file tree
Hide file tree
Showing 23 changed files with 894 additions and 301 deletions.
3 changes: 1 addition & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
### Issue Description
<!-- Add a brief description of the issue this PR solves. -->

Related issue: #`FILL_THIS_OUT`
Closes: FILL_THIS_OUT

### Approach
<!-- Add a description of the approach in this PR. -->
Expand All @@ -24,4 +24,3 @@ Related issue: #`FILL_THIS_OUT`

- [ ] Add tests
- [ ] Add changes to documentation (guides, repository pages, in-code descriptions)
- [x] A changelog entry is created automatically using the pull request title (do not manually add a changelog entry)
32 changes: 32 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,35 @@
# [4.3.0](https://github.com/parse-community/Parse-SDK-Android/compare/4.2.1...4.3.0) (2024-02-18)


### Features

* Add support for uploading a `ParseFile` from a URI ([#1207](https://github.com/parse-community/Parse-SDK-Android/issues/1207)) ([83aec68](https://github.com/parse-community/Parse-SDK-Android/commit/83aec68cb7f95e0116b3878b8cda099fd3a2e200))

## [4.2.1](https://github.com/parse-community/Parse-SDK-Android/compare/4.2.0...4.2.1) (2023-08-25)


### Bug Fixes

* Missing Proguard rules for R8 in full mode ([#1196](https://github.com/parse-community/Parse-SDK-Android/issues/1196)) ([7db0965](https://github.com/parse-community/Parse-SDK-Android/commit/7db09650447db2e0f82247240ae51687189cd03f))

# [4.2.0](https://github.com/parse-community/Parse-SDK-Android/compare/4.1.0...4.2.0) (2023-02-22)


### Features

* Add support for Facebook SDK 15.x ([#1188](https://github.com/parse-community/Parse-SDK-Android/issues/1188)) ([5ebd443](https://github.com/parse-community/Parse-SDK-Android/commit/5ebd4437ff9554cf981b9437e593ed7e9deb3675))

# [4.1.0](https://github.com/parse-community/Parse-SDK-Android/compare/4.0.0...4.1.0) (2022-08-26)


### Bug Fixes

* exception on concurrent download of `ParseFile` from multiple threads ([#1180](https://github.com/parse-community/Parse-SDK-Android/issues/1180)) ([44b1914](https://github.com/parse-community/Parse-SDK-Android/commit/44b191497a29429bca0ab6bf44fb63c69515b3c9))

### Features

* upgrade various dependencies ([#1181](https://github.com/parse-community/Parse-SDK-Android/issues/1181)) ([c455f4a](https://github.com/parse-community/Parse-SDK-Android/commit/c455f4a4c183c7c11f57c9662542829e82b207ad))

# [4.0.0](https://github.com/parse-community/Parse-SDK-Android/compare/3.0.1...4.0.0) (2022-06-10)


Expand Down
33 changes: 26 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,39 @@ The Parse Android SDK has the following Android API and [Gradle Plugin][gradle-p

## Add Dependency

Add this in your root `build.gradle` file (**not** your module `build.gradle` file):
Add the line `maven { url 'https://www.jitpack.io' }` to your `settings.gradle` file, inside the `repositories` property, for example:

```gradle
allprojects {
dependencyResolutionManagement {
repositories {
...
maven { url "https://jitpack.io" }
maven { url 'https://www.jitpack.io' }
}
}
```

Then, add the library to your project `build.gradle`
Older versions of Android studio require different steps. See the following list of Android Studio versions for alternative instructions. You can find the version of your Android Studio installation by clicking on *Help > About* in the top menu.

<details>
<summary>Arctic Fox | 2020.3.1 or older</summary>
<br>

>
> Add this in your root `build.gradle` file, **not** your module `build.gradle` file:
>
> ```gradle
> allprojects {
> repositories {
> ...
> maven { url "https://jitpack.io" }
> }
> }
> ```
>
> Then, add the library to your project `build.gradle` file.
</details>
Then, add the library to your (module:app) `build.gradle` file, replacing `latest.version.here` with the version of the Parse Android SDK you would like to use. We commend always updating your app to use the [latest release](https://github.com/parse-community/Parse-SDK-Android/releases) version.
```gradle
ext {
Expand All @@ -81,8 +102,6 @@ dependencies {
}
```
replacing `latest.version.here` with the latest released version (see JitPack badge above).

## Setup

Initialize Parse in a custom class that extends `Application`:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = "1.6.20"
ext.kotlin_version = "1.7.10"
ext.jacocoVersion = '0.8.7'
repositories {
google()
Expand Down
2 changes: 1 addition & 1 deletion facebook/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ android {
}

dependencies {
api "com.facebook.android:facebook-login:[13.2.0, 14.0["
api "com.facebook.android:facebook-login:[13.2.0, 17.0.0["
implementation project(":parse")

testImplementation "junit:junit:$rootProject.ext.junitVersion"
Expand Down
2 changes: 1 addition & 1 deletion fcm/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ android {
}

dependencies {
api 'com.google.firebase:firebase-messaging:23.0.3'
api 'com.google.firebase:firebase-messaging:23.0.7'
implementation project(":parse")
}

Expand Down
6 changes: 3 additions & 3 deletions google/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ android {

dependencies {
api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
api "com.google.android.gms:play-services-auth:20.1.0"
api "androidx.activity:activity-ktx:1.4.0"
api "androidx.fragment:fragment-ktx:1.4.1"
api "com.google.android.gms:play-services-auth:20.2.0"
api "androidx.activity:activity-ktx:1.5.1"
api "androidx.fragment:fragment-ktx:1.5.2"
implementation project(":parse")
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version = 4.0.0
version = 4.3.0
android.enableJetifier = true
android.useAndroidX = true
Loading

0 comments on commit 4653c28

Please sign in to comment.