-
Notifications
You must be signed in to change notification settings - Fork 238
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore(deps): Amplify Android 2.15.0 #4279
Merged
Merged
Changes from 80 commits
Commits
Show all changes
81 commits
Select commit
Hold shift + click to select a range
faf7f7d
chore(deps): Amplify Android 2.14.7
khatruong2009 67e1e35
Merge branch 'main' into chore/android-2.14.7
khatruong2009 c759f57
chore: update Kotlin version
khatruong2009 1c24861
chore: try updating kotlin serialization
khatruong2009 02f6224
Revert "chore: try updating kotlin serialization"
khatruong2009 e0eee84
chore: revert kotlin back to last major version
khatruong2009 3ac2726
chore: revert kotlin to 1.8.22
khatruong2009 6dab253
chore: upgrade kotlin in the corresponding examples
khatruong2009 344c15f
chore: update gradle version on datastore example
khatruong2009 a7edeb6
chore: upgrade gradle
khatruong2009 0e339a0
chore: attempt to fix gradle url
khatruong2009 c4fccd8
chore: revert back to last kotlin major version
khatruong2009 a295039
chore: change gradle version back to 7.4.2
khatruong2009 9a8cfcc
chore: match Kotlin to Android's version
khatruong2009 e46a021
chore: make kotlin version consistent through both packages
khatruong2009 c9b481f
chore: update to new android release
khatruong2009 1f383f7
chore: downgrade amplify-android version back to 2.14.7 with fix
khatruong2009 c82259c
chore: bump android version to latest
khatruong2009 bfbdfe5
chore: bump push notifications to the latest version of android
khatruong2009 dbe2bb4
Merge branch 'main' into chore/android-2.14.7
khatruong2009 a8d57bf
chore: try switching to android version 11
khatruong2009 a36e141
chore: lowered desugaring version
khatruong2009 7478188
chore: reduced gradle distribution to 7.4
khatruong2009 e14697a
chore: change kotlin version back to 1.9.10 and gradle distribution u…
khatruong2009 5223102
chore: move java back to 1_8
khatruong2009 a9cca7e
chore: changed java version back to 1.8 in example/app/build.gradle
khatruong2009 eb5a145
chore: put namespace back at the bottom of android
khatruong2009 766b941
chore: remove change date and put distribution URL back to the bottom
khatruong2009 05a6101
chore: remove multi-dex
khatruong2009 f749c70
chore: change the distribution URL back to what it was before
khatruong2009 761362d
chore: revert changes back to android bump only
khatruong2009 6fd3088
chore: revert gradle versions on datastore
khatruong2009 49974f5
Merge branch 'main' into chore/android-2.14.7
khatruong2009 d1c6bbd
chore: upgrade amplify-android to 2.14.9 and gradle to 8.1.0
khatruong2009 1cb0f32
Merge branch 'main' into chore/android-2.14.7
khatruong2009 32ecb67
chore: updated gradle version in datastore example app and added name…
khatruong2009 74fd3a7
chore: upgrade java version on push notifications and datastore examp…
khatruong2009 701daac
chore: updated jvm target in datastore and push notifications example…
khatruong2009 6ef27c8
chore: added proguard rules to datastore and push notifications examp…
khatruong2009 7f13e59
chore: change java version back to 1.8 for datastore and push notific…
khatruong2009 901eb10
chore: update java-version in actions.yaml
khatruong2009 2311139
Revert "chore: update java-version in actions.yaml"
khatruong2009 b927a27
Merge branch 'main' into chore/android-2.14.7
khatruong2009 1ee5965
chore: test mvoing android gradle files into new format released by f…
khatruong2009 72de881
chore: move plugins block to the top
khatruong2009 3e7203a
Merge branch 'main' into chore/android-2.14.7
khatruong2009 4a4a56d
Revert "chore: move plugins block to the top"
khatruong2009 bb70336
Revert "chore: test mvoing android gradle files into new format relea…
khatruong2009 345d90b
chore: remove proguard files
khatruong2009 924e06b
chore: added jvm target in datastore to android build.gradle so that …
khatruong2009 6ece597
chore: try manually adding a java version to the amplify datastore gi…
khatruong2009 733c5f3
Revert "chore: try manually adding a java version to the amplify data…
khatruong2009 6217ad2
chore: manually require java 17 in flutter_android.yaml file
khatruong2009 cf8d252
Merge branch 'main' into chore/android-2.14.7
khatruong2009 1f2a400
chore: ran ktlintFormat on datastore/android/src/test files
khatruong2009 bf51528
chore: bump robolectric
khatruong2009 ba379db
chore: upgrade android to 2.14.11
khatruong2009 46c3da9
Merge branch 'main' into chore/android-2.14.7
khatruong2009 09c0f36
Merge branch 'main' into chore/android-2.14.7
khatruong2009 f7515a9
chore: made changes to uithreadhandler and added injectable datastore…
khatruong2009 bdaba20
Merge branch 'main' into chore/android-2.14.7
khatruong2009 0a0a4e8
chore: change Throwable serializer and added uiThreadhandler argument…
khatruong2009 4da1fbf
Merge branch 'main' into chore/android-2.14.7
khatruong2009 5ad338a
chore: update to the latest version of android
khatruong2009 fa6bc51
chore: add GraphQL Exception serializer
khatruong2009 115f0e8
chore: added comment to trigger tests
khatruong2009 8b09e93
chore: bump java version to 17 in e2e android test
khatruong2009 23159e1
Merge branch 'main' into chore/android-2.14.7
khatruong2009 107ec25
chore: remove test comment used to trigger tests
khatruong2009 55bd04e
chore: bump amplify-android push notifications version
khatruong2009 fc31321
chore: remove unnecessary imports and variables
khatruong2009 7144f4a
chore: removed parcelize and deprecated compileSdkVersion
khatruong2009 6f69b4f
chore: updated compileSdkVersion to compileSdk
khatruong2009 f20dc1d
chore: added times called back into test
khatruong2009 fb01657
chore: upgrade java version to 17 in android packages
khatruong2009 4eeb993
set java version to 17
01d87aa
chore: bump compileSdk for secure storage to 34
khatruong2009 8afd4f5
chore: fix amplify_datastore build.gradle
khatruong2009 2d7801a
Revert "chore: bump compileSdk for secure storage to 34"
khatruong2009 0912b4f
chore: change compileSdk to flutter.compileSdkVersion for example app
khatruong2009 8d613e5
chore: run tests for sdk 24
Jordan-Nelson File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,6 +31,12 @@ jobs: | |
exclude: | ||
- channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }} | ||
steps: | ||
- name: Setup Java | ||
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # 3.12.0 | ||
with: | ||
distribution: "corretto" # Amazon Corretto Build of OpenJDK | ||
java-version: "17" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same as above |
||
|
||
- name: Git Checkout | ||
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # 3.6.0 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
packages/amplify/amplify_flutter/example/android/app/build.gradle
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
packages/amplify_datastore/android/gradle/wrapper/gradle-wrapper.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,7 @@ | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip | ||
networkTimeout=10000 | ||
Equartey marked this conversation as resolved.
Show resolved
Hide resolved
|
||
validateDistributionUrl=true | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why to update the java version? I think the java version used in our android packages are still version 8 and so not sure why to use different version on CI.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The newer gradle version to 8.1.0 requires java 17 and above to run.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see, so I think we should update the java version and jvmTraget in the android packages as well