Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Goog -> Github merge #836

Merged
merged 57 commits into from
Jul 13, 2023
Merged

Goog -> Github merge #836

merged 57 commits into from
Jul 13, 2023

Conversation

dturner
Copy link
Collaborator

@dturner dturner commented Jul 13, 2023 •
edited
Loading

  • Bump version code to 7 and version name to 0.1.1 for Play release (scheduled 17th/18th July 2023).
  • Use JDK 17 for internal builds
  • Remove problematic API 23 from FTL

dturner and others added 30 commits May 2, 2023 23:53
@dturner
Change JAVA_HOME path to use JDK 17 from prebuilts repo
13a6f85 
Change-Id: I91933628d32de2a703c4a6955827044533dd7cdd
Merge branch 'github/main'
479e106
@dturner
Add path to JDK 17
8c9f656 
Change-Id: If6fd6fab4517242f7bad9149ae2fdbdbbca7ef34
Merge branch 'github/main'
bb83fb9
@dturner
Merge "Add path to JDK 17" into main
8ee58cc
@dturner
Remove path to JDK 17 (this is installed using apt instead)
db5198f 
Change-Id: I6650999f5f750366d2c7277614e26cbb05828b98
Merge branch 'github/main'
c73a2fa
@dturner
Merge remote-tracking branch 'github/main' into may23automerger
d02ca37 
* github/main:
  Improvement in the Search screen (#717)
  Fix build
  Fix navigation tests
  Route notification deep link through for you screen, with spotless fixes
  Route notification deep link through for you screen
  Add pending intent for opening notification links
  Notify users when news are updated

Change-Id: Id0373d61be19ab6fa9c42f6beca28a42dbdde225
@dturner
Bump version name to 0.1.0 (versionCode 6)
0829cb7 
Change-Id: I880683a37b4324f91499eeb47b418ab5e2d1242b
Merge branch 'github/main'
4eaad4c
Merge branch 'github/main'
f00009e
Merge branch 'github/main'
d1e3897
Merge branch 'github/main'
6c7b190
Merge branch 'github/main'
b8a6dbf
Merge branch 'github/main'
082abe8
Merge branch 'github/main'
0c2e01b
Merge branch 'github/main'
61baaf6
Merge branch 'github/main'
98d3645
Merge branch 'github/main'
ed4d30f
Merge branch 'github/main'
d0acdca
Merge branch 'github/main'
5d93ff5
Merge branch 'github/main'
1825d27
Merge branch 'github/main'
5fc7f1b
Merge branch 'github/main'
23d8ebf
Merge branch 'github/main'
7efc47f
Merge branch 'github/main'
fab4768
Merge branch 'github/main'
cc2c6db
Merge branch 'github/main'
9241b06
Merge branch 'github/main'
03286ea
Merge branch 'github/main'
d171acc
Automerger and others added 22 commits June 6, 2023 15:59
Merge branch 'github/main'
1598d75
Merge branch 'github/main'
e62b3cb
Merge branch 'github/main'
b434112
Merge branch 'github/main'
be4fb68
Merge branch 'github/main'
8fe6a3d
Merge branch 'github/main'
a4e8153
Merge branch 'github/main'
1dad5be
Merge branch 'github/main'
8b024f0
Merge branch 'github/main'
316263b
Merge branch 'github/main'
41533a5
Merge branch 'github/main'
da1ee0c
Merge branch 'github/main'
fb9c856
Merge branch 'github/main'
44c3c6d
Merge branch 'github/main'
49a3f47
Merge branch 'github/main'
7efa45c
Merge branch 'github/main'
3741965
Merge branch 'github/main'
27ef251
Merge branch 'github/main'
4869a4c
Merge branch 'github/main'
d61dd5e
@dturner
Remove problematic API 23 device from FTL tests
14e53e2 
Change-Id: I85b3979ffda637d558f071ac10663f5578f85db7
Merge branch 'github/main'
7b24ba3
@dturner
Bump version to code=7, name=0.1.1
7f62b72 
Change-Id: I2d8fa940dc5e4c14e3c9df650bc1f1432a330f02
@google-cla
Copy link

google-cla bot commented Jul 13, 2023

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@dturner dturner merged commit 2ac13e8 into main Jul 13, 2023
1 of 2 checks passed
@dturner dturner deleted the jul13-merge branch July 13, 2023 11:02
@Razetkai
Copy link

Razetkai commented Jul 13, 2023 via email

@Azeemahx2
Copy link

четверг, 13 июля 2023 г. пользователь Don Turner @.***>
написал:

You can view, comment on, or merge this pull request online at:

#836
Commit Summary

File Changes

(4 files https://github.com/android/nowinandroid/pull/836/files)

Patch Links:

—
Reply to this email directly, view it on GitHub
#836, or unsubscribe
https://github.com/notifications/unsubscribe-auth/A3VICMYMKWNGL56QYOGYU43XP7IE3ANCNFSM6AAAAAA2IYODPU
.
You are receiving this because you are subscribed to this thread.Message
ID: @.***>

--
null

@PunkinAnarcrassy
Copy link

  • Bump version code to 7 and version name to 0.1.1 for Play release (scheduled 17th/18th July 2023).
  • Use JDK 17 for internal builds
  • Remove problematic API 23 from FTL

@PunkinAnarcrassy PunkinAnarcrassy mentioned this pull request Mar 6, 2024
Closed
Saemza20230
Saemza20230 reviewed Sep 17, 2024
View reviewed changes
Copy link

@Saemza20230 Saemza20230 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Saemza20230 Saemza20230 Saemza20230 left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dturner @Razetkai @Azeemahx2 @PunkinAnarcrassy @Saemza20230