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.

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

Update M3 library, Increase target sdk to 34 #12106

Merged
merged 4 commits into from
Nov 17, 2023

Conversation

alperozturk96
Copy link
Collaborator

@alperozturk96 alperozturk96 commented Oct 30, 2023

  • Tests written, or not not needed

@@ -84,8 +84,8 @@ android {

defaultConfig {
minSdkVersion 24
targetSdkVersion 33
compileSdk 33
targetSdkVersion 34
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Needed for latest M3 library

@ZetaTom ZetaTom linked an issue Oct 30, 2023 that may be closed by this pull request
Copy link
Collaborator

@ZetaTom ZetaTom left a comment

Choose a reason for hiding this comment

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

Seems to work well during my brief tests. Have the behavioural changes of Android 14 been addressed already?

According to the lint bot there are apparently some missing super calls in various activities that haven't been changed by this pull request. Maybe something else or some requirements have changed in the meantime?

@alperozturk96
Copy link
Collaborator Author

alperozturk96 commented Oct 30, 2023

As far as I know regarding behavioural changes on Android 14 nothing specifically done in codebase. Regardless targetSdkVersion if device have Android 14 that changes automatically done so increasing or decreasing targetSdkVersion not going to effect anything on Android 14 devices. @ZetaTom We must check "Behavior changes" for Android 14 device but I think it's not related to this PR.

Seems like after targetSdkVersion change Linter seeing those intentionally not called super method as warning. However, I see that the default action is not requested in those activities. If we call super methods, the behavior of the application may change. In this case we can use "Suppress" annotation.

@AndyScherzinger AndyScherzinger force-pushed the update/material-design-library branch 3 times, most recently from bf64bb7 to bb73d47 Compare November 2, 2023 09:50
@tobiasKaminsky
Copy link
Member

Unit tests are failing to compile:

Task :app:compileGplayDebugUnitTestKotlin FAILED
e: file:///home/runner/actions-runner/_work/android/android/app/src/test/java/com//client/core/LocalConnectionTest.kt:68:39 Overload resolution ambiguity:
public open fun bindService(p0: Intent, p1: ServiceConnection, p2: Context.BindServiceFlags): Boolean defined in android.content.Context
public abstract fun bindService(p0: Intent, p1: ServiceConnection, p2: Int): Boolean defined in android.content.Context
e: file:///home/runner/actions-runner/_work/android/android/app/src/test/java/com/
/client/core/LocalConnectionTest.kt:79:25 None of the following functions can be called with the arguments supplied:
public open fun bindService(p0: Intent, p1: ServiceConnection, p2: Context.BindServiceFlags): Boolean defined in android.content.Context
public abstract fun bindService(p0: Intent, p1: ServiceConnection, p2: Int): Boolean defined in android.content.Context
e: file:///home/runner/actions-runner/_work/android/android/app/src/test/java/com//client/core/LocalConnectionTest.kt:79:73 The boolean literal does not conform to the expected type Unit
e: file:///home/runner/actions-runner/_work/android/android/app/src/test/java/com/
/client/core/LocalConnectionTest.kt:84:26 None of the following functions can be called with the arguments supplied:
public open fun bindService(p0: Intent, p1: ServiceConnection, p2: Context.BindServiceFlags): Boolean defined in android.content.Context
public abstract fun bindService(p0: Intent, p1: ServiceConnection, p2: Int): Boolean defined in android.content.Context
w: Detected multiple Kotlin daemon sessions at kotlin/sessions

@tobiasKaminsky
Copy link
Member

Android 14 specific can and should be discussed in #11791

Copy link
Member

@tobiasKaminsky tobiasKaminsky left a comment

Choose a reason for hiding this comment

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

Tests are failing to compile

@alperozturk96
Copy link
Collaborator Author

/rebase

2 similar comments
@alperozturk96
Copy link
Collaborator Author

/rebase

@alperozturk96
Copy link
Collaborator Author

/rebase

@AndyScherzinger
Copy link
Member

@alperozturk96 has conflicts on rebase (!)

@alperozturk96
Copy link
Collaborator Author

/rebase

1 similar comment
@alperozturk96
Copy link
Collaborator Author

/rebase

@AndyScherzinger
Copy link
Member

@alperozturk96 you need to rebase yourself, since you will have to resolve conflicts which you originally resolved during pulling in master. So the rebase comment won't work.

Signed-off-by: Andy Scherzinger <[email protected]>
Copy link

Codacy

Lint

TypemasterPR
Warnings7575
Errors00

SpotBugs

CategoryBaseNew
Bad practice2626
Correctness7070
Dodgy code363363
Experimental22
Internationalization99
Malicious code vulnerability22
Multithreaded correctness99
Performance5858
Security1818
Total557557

Copy link

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/12106.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

Copy link
Member

@AndyScherzinger AndyScherzinger left a comment

Choose a reason for hiding this comment

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

Unit tests are fine, only codecov upload fails (not related) and Drone failures are also not related.

@AndyScherzinger
Copy link
Member

@tobiasKaminsky @ZetaTom works for my on my phone, however I didn't check for the behavioral changed but as stated by Tobias are to be discussed in the or ticket. So for me the PR is good to go.

@AndyScherzinger AndyScherzinger added this to the Nextcloud App 3.27.0 milestone Nov 17, 2023
@AndyScherzinger AndyScherzinger merged commit f09c3da into master Nov 17, 2023
17 of 19 checks passed
@delete-merged-branch delete-merged-branch bot deleted the update/material-design-library branch November 17, 2023 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants