Cannot jetify library with invalid commented out proguard rules [134100420]

Fixed

Bug

Status Update

No update yet.

Description

ca...@gmail.com

created issue #1

May 31, 2019 11:37AM

OS: macOS 10.14.5
Java version "1.8.0_121"
Jetifier version: 1.0.0-beta04

Let there be a Library Foo with the following 'proguard-rules.txt' file:

# DBFlow
-keep class * extends com.raizlabs.android.dbflow.config.DatabaseHolder { *; }
-dontwarn com.raizlabs.android.dbflow.**
# Note: the configuration keeps the entry point 'com.raizlabs.android.dbflow.config.FlowManager$GlobalDatabaseHolder { FlowManager$GlobalDatabaseHolder(com.raizlabs.android.dbflow.config.FlowManager$1); }', but not the descriptor class 'com.raizlabs.android.dbflow.config.FlowManager$1'
-keep class com.raizlabs.android.dbflow.config.FlowManager$*

When trying to jetify this library:

./jetifier-standalone -i /Users/someuser/Downloads/foo/foo.aar -o newfoo.aar

The Jetifier fails with the following output:

Exception in thread "main" java.util.regex.PatternSyntaxException: Illegal repetition near index 147
com/raizlabs/android/dbflow/.*
# Note: the configuration keeps the entry point 'com/raizlabs/android/dbflow/config/FlowManager$GlobalDatabaseHolder { FlowManager$GlobalDatabaseHolder(com/raizlabs/android/dbflow/config/FlowManager$1); }'
^
at java.util.regex.Pattern.error(Pattern.java:1955)
at java.util.regex.Pattern.closure(Pattern.java:3157)
at java.util.regex.Pattern.sequence(Pattern.java:2134)
at java.util.regex.Pattern.expr(Pattern.java:1996)
at java.util.regex.Pattern.compile(Pattern.java:1696)
at java.util.regex.Pattern.<init>(Pattern.java:1351)
at java.util.regex.Pattern.compile(Pattern.java:1028)
at com.android.tools.build.jetifier.core.type.TypesMap.matchOldProguardForNewTypes(TypesMap.kt:112)
[...]

If i remove the notes, the new 'proguard-rules.txt' looks like this:

# DBFlow
-keep class * extends com.raizlabs.android.dbflow.config.DatabaseHolder { *; }
-dontwarn com.raizlabs.android.dbflow.**
-keep class com.raizlabs.android.dbflow.config.FlowManager$*

And this runs through the jetifier just fine. Please provide a fix for this issue, since i have to patch my dependencies currently in order to make AndroidX work for me.

Comments

do...@traveloka.com <do...@traveloka.com> #2Jul 9, 2019 09:39AM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit 92bd7222fcfd7523e8fa80b7f72e967b8bbf4750
Author: Ian Lake <ilake@google.com>
Date: Tue Aug 27 10:07:52 2019

Split LifecycleCallbacks from FragmentManager

Create a separate FragmentLifecycleCallbacksDispatcher
object that is responsible for dispatching
FragmentLifecycleCallbacks events.

Test: existing FragmentLifecycleTest pass
BUG: 139536619
Change-Id: I64cc2b364af65760b0008efb317a742df2c0718d

A fragment/fragment/src/main/java/androidx/fragment/app/FragmentLifecycleCallbacksDispatcher.java
M fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java

https://android-review.googlesource.com/1110155

https://goto.google.com/android-sha1/92bd7222fcfd7523e8fa80b7f72e967b8bbf4750

pa...@gmail.com <pa...@gmail.com> #3Oct 17, 2019 09:40AM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit 092d14cd22c174405221b930665869f7c9fc8b65
Author: Ian Lake <ilake@google.com>
Date: Tue Aug 27 14:46:02 2019

Remove FragmentState mInstance

Make FragmentState a simple Parcelable by removing
its mInstance field and its instantiate() method.

This required we change the order of restoring:
instead of reconnecting retained Fragments with their
FragmentState instances, we first iterate through
all FragmentState instances and do one of two things:
1) Reconnect the retained fragment if it exists
2) Create a new fragment from the FragmentState

This allows us to do just one pass through our
FragmentState objects and run the edge case of
detecting retained fragments created after the
state was saved after creating the set of active
fragments.

Test: all existing tests pass
BUG: 139536619
Change-Id: Iba7cc300c127bc05127d122fa5acc1ccc871a76b

M fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
M fragment/fragment/src/main/java/androidx/fragment/app/FragmentManagerViewModel.java
M fragment/fragment/src/main/java/androidx/fragment/app/FragmentState.java

https://android-review.googlesource.com/1108716

https://goto.google.com/android-sha1/092d14cd22c174405221b930665869f7c9fc8b65

pa...@gmail.com <pa...@gmail.com> #4Oct 17, 2019 09:44AM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit 66d98b470d8887fdd16461c2da0df69ec62dd8d8
Author: Ian Lake <ilake@google.com>
Date: Fri Aug 16 13:22:20 2019

Add skeleton for FragmentStateManager

Store a HashMap of mWho to FragmentStateManager
instances. This serves as the minimal starting
point for moving logic that interacts with a
single Fragment from FragmentManager into
FragmentStateManager.

Test: existing tests pass, new FragmentStateManagerTest
BUG: 139536619
Change-Id: Ifaea272a3202e918143f65245fb98157ad971827

A fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentStateManagerTest.kt
M fragment/fragment/src/main/java/androidx/fragment/app/BackStackState.java
M fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java
M fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
A fragment/fragment/src/main/java/androidx/fragment/app/FragmentStateManager.java

https://android-review.googlesource.com/1109796

https://goto.google.com/android-sha1/66d98b470d8887fdd16461c2da0df69ec62dd8d8

ga...@google.com <ga...@google.com> #5Oct 17, 2019 11:41AM

Assigned to pa...@google.com.

Project: platform/frameworks/support
Branch: androidx-master-dev

commit 92d322f39a3436da8ce0e59f55194c70abe1fb8e
Author: Ian Lake <ilake@google.com>
Date: Tue Aug 27 16:46:05 2019

Move saving/restore Fragment state to FragmentStateManager

Separate the saving and restoring of Fragment
instances from FragmentManager, allowing
FragmentStateManager to fully manage the
restoration of Fragments.

Test: new FragmentStateManagerTest, existing tests
BUG: 139536619
Change-Id: Iba0df8f617d7805995612eaad52e26f5f2e99707

M fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentStateManagerTest.kt
M fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
M fragment/fragment/src/main/java/androidx/fragment/app/FragmentStateManager.java

https://android-review.googlesource.com/1109797

https://goto.google.com/android-sha1/92d322f39a3436da8ce0e59f55194c70abe1fb8e

pa...@google.com <pa...@google.com> #6Oct 25, 2019 03:40PM

Accepted by pa...@google.com.

Project: platform/frameworks/support
Branch: androidx-master-dev

commit 5318d9bfea4baae7190875673fd087b9526c30c5
Author: Ian Lake <ilake@google.com>
Date: Wed Sep 04 13:40:58 2019

Move ensureInflatedFragmentView to FragmentStateManager

Move this logic into FragmentStateManager.

Test: all existing tests pass
BUG: 139536619
Change-Id: I1f8fafba5e35fda592bbe13954eed2ff355aae55

M fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
M fragment/fragment/src/main/java/androidx/fragment/app/FragmentStateManager.java

https://android-review.googlesource.com/1113752

https://goto.google.com/android-sha1/5318d9bfea4baae7190875673fd087b9526c30c5

ap...@google.com <ap...@google.com> #7Oct 31, 2019 06:24PM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit 61497f97f85997ed8bf4dd58d6e513e810784f1e
Author: Ian Lake <ilake@google.com>
Date: Fri Sep 20 14:23:27 2019

Have FragmentStateManager compute the Fragment's max state

Move logic restricting the Fragment to a particular
state into FragmentStateManager.

Test: all existing tests pass
BUG: 139536619
Change-Id: Ief8528ed9990da515f0765199f64f4ca04bd2494

M fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
M fragment/fragment/src/main/java/androidx/fragment/app/FragmentStateManager.java

https://android-review.googlesource.com/1126844

https://goto.google.com/android-sha1/61497f97f85997ed8bf4dd58d6e513e810784f1e

pa...@google.com <pa...@google.com> #8Nov 26, 2019 02:34PM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit 359974ef2d7a879b4a96373b96e1c537b252dfa2
Author: Ian Lake <ilake@google.com>
Date: Thu Sep 26 14:56:35 2019

Move start/resume/pause/stop to FragmentStateManager

Test: Fragment tests still pass
BUG: 139536619
Change-Id: I1cabaaa361e9b0d0e142b06e5d9ee4a7c1b1e4c4

M fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
M fragment/fragment/src/main/java/androidx/fragment/app/FragmentStateManager.java

https://android-review.googlesource.com/1129475

https://goto.google.com/android-sha1/359974ef2d7a879b4a96373b96e1c537b252dfa2

pa...@gmail.com <pa...@gmail.com> #9Nov 26, 2019 02:40PM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit 669381d551753c454afbf5ff5d0cfb66bac78247
Author: Ian Lake <ilake@google.com>
Date: Tue Oct 01 11:14:39 2019

Move attach/detach to FragmentStateManager

Logic in dealing with target fragments and
mActive remain in moveToState() for now.

Test: Fragment tests still pass
BUG: 139536619
Change-Id: If65bce1b315b7e5a9010a39044c406cb3d3be37d

M fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
M fragment/fragment/src/main/java/androidx/fragment/app/FragmentStateManager.java

https://android-review.googlesource.com/1131672

https://goto.google.com/android-sha1/669381d551753c454afbf5ff5d0cfb66bac78247

hu...@google.com <hu...@google.com> #10Nov 27, 2019 05:34PM

Marked as fixed.

Project: platform/frameworks/support
Branch: androidx-master-dev

commit bef266f3ab8734afc111c70413687380ad2d9161
Author: Ian Lake <ilake@google.com>
Date: Tue Oct 01 11:04:33 2019

Move create/destroy to FragmentStateManager

Due to restoreSaveState()'s cleaning up
of no longer valid retained Fragments, moveToState()
now always creates a FragmentStateManager if one
does not exist so that we can continue to run the
create callbacks despite these retained Fragments
not being in mActive.

Interactions with mExitAnimationCancellationSignals
as part of destroying the Fragment remain in
moveToState() for now.

Test: Fragment tests still pass
BUG: 139536619
Change-Id: Id05f4e78f6fc0cef6be9cc7abc0d58b40b2e3f43

M fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
M fragment/fragment/src/main/java/androidx/fragment/app/FragmentStateManager.java

https://android-review.googlesource.com/1131291

https://goto.google.com/android-sha1/bef266f3ab8734afc111c70413687380ad2d9161