diff --git a/.gitignore b/.gitignore
index 5b69dee8..2053918f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /.idea/copyright/profiles_settings.xml
 /.idea/encodings.xml
 /.idea/
+/Fetch.zip
diff --git a/LICENSE b/LICENSE
index a2d4fb50..f288702d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,201 +1,674 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2017 Tonyo Francis
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/fetch2/build.gradle b/fetch2/build.gradle
index 0d30e3c1..6bf5f6c4 100644
--- a/fetch2/build.gradle
+++ b/fetch2/build.gradle
@@ -29,7 +29,7 @@ android {
         versionCode library_version_code
         versionName library_version
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
     }
 
@@ -63,13 +63,13 @@ android {
 dependencies {
 
     api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    kapt "android.arch.persistence.room:compiler:$room_version"
-    api "android.arch.persistence.room:runtime:$room_version"
+    kapt 'androidx.room:room-compiler:2.0.0'
+    api 'androidx.room:room-runtime:2.0.0'
     api project(':fetch2core')
 
     testImplementation "junit:junit:$junit_version"
-    androidTestImplementation "com.android.support.test:runner:$test_runner_version"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$espresso_version"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }
 
 //publish {
diff --git a/fetch2/src/androidTest/java/com/tonyodev/fetch2/DatabaseInstrumentedTest.java b/fetch2/src/androidTest/java/com/tonyodev/fetch2/DatabaseInstrumentedTest.java
index fd914b26..fefe8969 100644
--- a/fetch2/src/androidTest/java/com/tonyodev/fetch2/DatabaseInstrumentedTest.java
+++ b/fetch2/src/androidTest/java/com/tonyodev/fetch2/DatabaseInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.tonyodev.fetch2;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.tonyodev.fetch2.database.FetchDatabaseManager;
 import com.tonyodev.fetch2.database.FetchDatabaseManagerImpl;
diff --git a/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadManagerInstrumentedTest.java b/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadManagerInstrumentedTest.java
index eddfb19c..437b069d 100644
--- a/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadManagerInstrumentedTest.java
+++ b/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadManagerInstrumentedTest.java
@@ -3,8 +3,8 @@
 import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.tonyodev.fetch2.database.FetchDatabaseManager;
 import com.tonyodev.fetch2.database.FetchDatabaseManagerImpl;
diff --git a/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadPriorityIteratorProcessorTest.java b/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadPriorityIteratorProcessorTest.java
index fdb191ce..8297c83c 100644
--- a/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadPriorityIteratorProcessorTest.java
+++ b/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadPriorityIteratorProcessorTest.java
@@ -4,8 +4,8 @@
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.tonyodev.fetch2.database.FetchDatabaseManager;
 import com.tonyodev.fetch2.database.FetchDatabaseManagerImpl;
diff --git a/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadProviderInstrumentedTest.java b/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadProviderInstrumentedTest.java
index 6df491aa..065a80f9 100644
--- a/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadProviderInstrumentedTest.java
+++ b/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadProviderInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.tonyodev.fetch2;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.tonyodev.fetch2.database.FetchDatabaseManager;
 import com.tonyodev.fetch2.database.FetchDatabaseManagerImpl;
diff --git a/fetch2/src/androidTest/java/com/tonyodev/fetch2/FetchBuilderTest.java b/fetch2/src/androidTest/java/com/tonyodev/fetch2/FetchBuilderTest.java
index bac47d88..da48d4b2 100644
--- a/fetch2/src/androidTest/java/com/tonyodev/fetch2/FetchBuilderTest.java
+++ b/fetch2/src/androidTest/java/com/tonyodev/fetch2/FetchBuilderTest.java
@@ -1,8 +1,8 @@
 package com.tonyodev.fetch2;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.tonyodev.fetch2core.FetchLogger;
 
diff --git a/fetch2/src/androidTest/java/com/tonyodev/fetch2/FetchHandlerInstrumentedTest.java b/fetch2/src/androidTest/java/com/tonyodev/fetch2/FetchHandlerInstrumentedTest.java
index 1c3c3b71..b244550f 100644
--- a/fetch2/src/androidTest/java/com/tonyodev/fetch2/FetchHandlerInstrumentedTest.java
+++ b/fetch2/src/androidTest/java/com/tonyodev/fetch2/FetchHandlerInstrumentedTest.java
@@ -4,8 +4,8 @@
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.tonyodev.fetch2.database.FetchDatabaseManager;
 import com.tonyodev.fetch2.database.FetchDatabaseManagerImpl;
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/DefaultFetchNotificationManager.kt b/fetch2/src/main/java/com/tonyodev/fetch2/DefaultFetchNotificationManager.kt
index 72377859..b2050344 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/DefaultFetchNotificationManager.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/DefaultFetchNotificationManager.kt
@@ -8,7 +8,7 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.net.Uri
 import android.os.Build
-import android.support.v4.app.NotificationCompat
+import androidx.core.app.NotificationCompat
 
 import com.tonyodev.fetch2.DownloadNotification.ActionType.*
 import com.tonyodev.fetch2.util.DEFAULT_NOTIFICATION_TIMEOUT_AFTER
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/FetchNotificationManager.kt b/fetch2/src/main/java/com/tonyodev/fetch2/FetchNotificationManager.kt
index 60daed81..e418924e 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/FetchNotificationManager.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/FetchNotificationManager.kt
@@ -4,7 +4,7 @@ import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.BroadcastReceiver
 import android.content.Context
-import android.support.v4.app.NotificationCompat
+import androidx.core.app.NotificationCompat
 
 /**
  * Implement this interface to create, maintain and show notifications
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/database/Converter.kt b/fetch2/src/main/java/com/tonyodev/fetch2/database/Converter.kt
index 5833aa7d..478bc0ca 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/database/Converter.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/database/Converter.kt
@@ -1,6 +1,6 @@
 package com.tonyodev.fetch2.database
 
-import android.arch.persistence.room.TypeConverter
+import androidx.room.TypeConverter
 import com.tonyodev.fetch2.*
 import com.tonyodev.fetch2.util.EMPTY_JSON_OBJECT_STRING
 import com.tonyodev.fetch2.NetworkType
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadDao.kt b/fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadDao.kt
index 751e8fae..f7674424 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadDao.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadDao.kt
@@ -1,6 +1,6 @@
 package com.tonyodev.fetch2.database
 
-import android.arch.persistence.room.*
+import androidx.room.*
 import com.tonyodev.fetch2.Status
 import com.tonyodev.fetch2.database.DownloadDatabase.Companion.COLUMN_CREATED
 import com.tonyodev.fetch2.database.DownloadDatabase.Companion.COLUMN_FILE
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadDatabase.kt b/fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadDatabase.kt
index 573338f5..655e33fe 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadDatabase.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadDatabase.kt
@@ -1,8 +1,8 @@
 package com.tonyodev.fetch2.database
 
-import android.arch.persistence.room.Database
-import android.arch.persistence.room.RoomDatabase
-import android.arch.persistence.room.TypeConverters
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
 import com.tonyodev.fetch2.database.DownloadDatabase.Companion.DATABASE_VERSION
 import com.tonyodev.fetch2.database.migration.*
 
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadInfo.kt b/fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadInfo.kt
index e6248900..1e0a442b 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadInfo.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadInfo.kt
@@ -1,6 +1,6 @@
 package com.tonyodev.fetch2.database
 
-import android.arch.persistence.room.*
+import androidx.room.*
 import android.net.Uri
 import android.os.Parcel
 import android.os.Parcelable
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/database/FetchDatabaseManagerImpl.kt b/fetch2/src/main/java/com/tonyodev/fetch2/database/FetchDatabaseManagerImpl.kt
index a8ccbc24..d7e3c467 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/database/FetchDatabaseManagerImpl.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/database/FetchDatabaseManagerImpl.kt
@@ -1,7 +1,7 @@
 package com.tonyodev.fetch2.database
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.Room
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.Room
 import android.content.Context
 import android.database.Cursor
 import android.database.sqlite.SQLiteException
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/Migration.kt b/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/Migration.kt
index 8d3adcc0..59581f5b 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/Migration.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/Migration.kt
@@ -1,6 +1,6 @@
 package com.tonyodev.fetch2.database.migration
 
-import android.arch.persistence.room.migration.Migration
+import androidx.room.migration.Migration
 
 
 abstract class Migration constructor(startVersion: Int, endVersion: Int)
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationFiveToSix.kt b/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationFiveToSix.kt
index 76afcde7..825eab01 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationFiveToSix.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationFiveToSix.kt
@@ -1,6 +1,6 @@
 package com.tonyodev.fetch2.database.migration
 
-import android.arch.persistence.db.SupportSQLiteDatabase
+import androidx.sqlite.db.SupportSQLiteDatabase
 import com.tonyodev.fetch2.database.DownloadDatabase
 import com.tonyodev.fetch2.util.EMPTY_JSON_OBJECT_STRING
 
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationFourToFive.kt b/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationFourToFive.kt
index 4f7af647..d9c86675 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationFourToFive.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationFourToFive.kt
@@ -1,6 +1,6 @@
 package com.tonyodev.fetch2.database.migration
 
-import android.arch.persistence.db.SupportSQLiteDatabase
+import androidx.sqlite.db.SupportSQLiteDatabase
 import com.tonyodev.fetch2.database.DownloadDatabase
 
 class MigrationFourToFive : Migration(4, 5) {
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationOneToTwo.kt b/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationOneToTwo.kt
index d71a2e3a..fe71c859 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationOneToTwo.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationOneToTwo.kt
@@ -1,6 +1,6 @@
 package com.tonyodev.fetch2.database.migration
 
-import android.arch.persistence.db.SupportSQLiteDatabase
+import androidx.sqlite.db.SupportSQLiteDatabase
 import com.tonyodev.fetch2.database.DownloadDatabase
 
 
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationSixToSeven.kt b/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationSixToSeven.kt
index cceddf87..c1c164b2 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationSixToSeven.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationSixToSeven.kt
@@ -1,6 +1,6 @@
 package com.tonyodev.fetch2.database.migration
 
-import android.arch.persistence.db.SupportSQLiteDatabase
+import androidx.sqlite.db.SupportSQLiteDatabase
 import com.tonyodev.fetch2.database.DownloadDatabase
 import com.tonyodev.fetch2.util.DEFAULT_AUTO_RETRY_ATTEMPTS
 
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationThreeToFour.kt b/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationThreeToFour.kt
index 7f46688f..295c9a83 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationThreeToFour.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationThreeToFour.kt
@@ -1,6 +1,6 @@
 package com.tonyodev.fetch2.database.migration
 
-import android.arch.persistence.db.SupportSQLiteDatabase
+import androidx.sqlite.db.SupportSQLiteDatabase
 import com.tonyodev.fetch2.database.DownloadDatabase
 import com.tonyodev.fetch2.util.DEFAULT_UNIQUE_IDENTIFIER
 
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationTwoToThree.kt b/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationTwoToThree.kt
index e1271321..590a8d58 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationTwoToThree.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationTwoToThree.kt
@@ -1,6 +1,6 @@
 package com.tonyodev.fetch2.database.migration
 
-import android.arch.persistence.db.SupportSQLiteDatabase
+import androidx.sqlite.db.SupportSQLiteDatabase
 import com.tonyodev.fetch2.EnqueueAction
 import com.tonyodev.fetch2.database.DownloadDatabase
 
diff --git a/fetch2/src/main/res/drawable-hdpi/fetch_notification_cancel.png b/fetch2/src/main/res/drawable-hdpi/fetch_notification_cancel.png
old mode 100755
new mode 100644
diff --git a/fetch2/src/main/res/drawable-hdpi/fetch_notification_pause.png b/fetch2/src/main/res/drawable-hdpi/fetch_notification_pause.png
old mode 100755
new mode 100644
diff --git a/fetch2/src/main/res/drawable-hdpi/fetch_notification_resume.png b/fetch2/src/main/res/drawable-hdpi/fetch_notification_resume.png
old mode 100755
new mode 100644
diff --git a/fetch2/src/main/res/drawable-hdpi/fetch_notification_retry.png b/fetch2/src/main/res/drawable-hdpi/fetch_notification_retry.png
old mode 100755
new mode 100644
diff --git a/fetch2/src/main/res/drawable-mdpi/fetch_notification_cancel.png b/fetch2/src/main/res/drawable-mdpi/fetch_notification_cancel.png
old mode 100755
new mode 100644
diff --git a/fetch2/src/main/res/drawable-mdpi/fetch_notification_pause.png b/fetch2/src/main/res/drawable-mdpi/fetch_notification_pause.png
old mode 100755
new mode 100644
diff --git a/fetch2/src/main/res/drawable-mdpi/fetch_notification_resume.png b/fetch2/src/main/res/drawable-mdpi/fetch_notification_resume.png
old mode 100755
new mode 100644
diff --git a/fetch2/src/main/res/drawable-mdpi/fetch_notification_retry.png b/fetch2/src/main/res/drawable-mdpi/fetch_notification_retry.png
old mode 100755
new mode 100644
diff --git a/fetch2/src/main/res/drawable-xhdpi/fetch_notification_cancel.png b/fetch2/src/main/res/drawable-xhdpi/fetch_notification_cancel.png
old mode 100755
new mode 100644
diff --git a/fetch2/src/main/res/drawable-xhdpi/fetch_notification_pause.png b/fetch2/src/main/res/drawable-xhdpi/fetch_notification_pause.png
old mode 100755
new mode 100644
diff --git a/fetch2/src/main/res/drawable-xhdpi/fetch_notification_resume.png b/fetch2/src/main/res/drawable-xhdpi/fetch_notification_resume.png
old mode 100755
new mode 100644
diff --git a/fetch2/src/main/res/drawable-xhdpi/fetch_notification_retry.png b/fetch2/src/main/res/drawable-xhdpi/fetch_notification_retry.png
old mode 100755
new mode 100644
diff --git a/fetch2/src/main/res/drawable-xxhdpi/fetch_notification_cancel.png b/fetch2/src/main/res/drawable-xxhdpi/fetch_notification_cancel.png
old mode 100755
new mode 100644
diff --git a/fetch2/src/main/res/drawable-xxhdpi/fetch_notification_pause.png b/fetch2/src/main/res/drawable-xxhdpi/fetch_notification_pause.png
old mode 100755
new mode 100644
diff --git a/fetch2/src/main/res/drawable-xxhdpi/fetch_notification_resume.png b/fetch2/src/main/res/drawable-xxhdpi/fetch_notification_resume.png
old mode 100755
new mode 100644
diff --git a/fetch2/src/main/res/drawable-xxhdpi/fetch_notification_retry.png b/fetch2/src/main/res/drawable-xxhdpi/fetch_notification_retry.png
old mode 100755
new mode 100644
diff --git a/fetch2/src/main/res/drawable-xxxhdpi/fetch_notification_cancel.png b/fetch2/src/main/res/drawable-xxxhdpi/fetch_notification_cancel.png
old mode 100755
new mode 100644
diff --git a/fetch2/src/main/res/drawable-xxxhdpi/fetch_notification_pause.png b/fetch2/src/main/res/drawable-xxxhdpi/fetch_notification_pause.png
old mode 100755
new mode 100644
diff --git a/fetch2/src/main/res/drawable-xxxhdpi/fetch_notification_resume.png b/fetch2/src/main/res/drawable-xxxhdpi/fetch_notification_resume.png
old mode 100755
new mode 100644
diff --git a/fetch2/src/main/res/drawable-xxxhdpi/fetch_notification_retry.png b/fetch2/src/main/res/drawable-xxxhdpi/fetch_notification_retry.png
old mode 100755
new mode 100644
diff --git a/fetch2core/build.gradle b/fetch2core/build.gradle
index 7c87fff1..d3094a9f 100644
--- a/fetch2core/build.gradle
+++ b/fetch2core/build.gradle
@@ -28,7 +28,7 @@ android {
         versionCode library_version_code
         versionName library_version
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
     }
 
@@ -59,8 +59,8 @@ dependencies {
 
     api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     testImplementation "junit:junit:$junit_version"
-    androidTestImplementation "com.android.support.test:runner:$test_runner_version"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$espresso_version"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }
 
 //publish {
diff --git a/fetch2fileserver/build.gradle b/fetch2fileserver/build.gradle
index 57cfa6fb..835394c2 100644
--- a/fetch2fileserver/build.gradle
+++ b/fetch2fileserver/build.gradle
@@ -28,7 +28,7 @@ android {
         versionCode library_version_code
         versionName library_version
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
     }
 
@@ -56,16 +56,16 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "com.android.support:appcompat-v7:$android_support_version"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    kapt "android.arch.persistence.room:compiler:$room_version"
-    api "android.arch.persistence.room:runtime:$room_version"
+    kapt 'androidx.room:room-compiler:2.0.0'
+    api 'androidx.room:room-runtime:2.0.0'
 
     api project(':fetch2core')
 
     testImplementation "junit:junit:$junit_version"
-    androidTestImplementation "com.android.support.test:runner:$test_runner_version"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$espresso_version"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }
 
 //publish {
diff --git a/fetch2fileserver/src/androidTest/java/com/tonyodev/fetch2fileserver/ExampleInstrumentedTest.java b/fetch2fileserver/src/androidTest/java/com/tonyodev/fetch2fileserver/ExampleInstrumentedTest.java
index 7a07e352..f53698e0 100644
--- a/fetch2fileserver/src/androidTest/java/com/tonyodev/fetch2fileserver/ExampleInstrumentedTest.java
+++ b/fetch2fileserver/src/androidTest/java/com/tonyodev/fetch2fileserver/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.tonyodev.fetch2fileserver;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FetchFileResourceInfoDatabase.kt b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FetchFileResourceInfoDatabase.kt
index 25be42db..1ba5e14b 100644
--- a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FetchFileResourceInfoDatabase.kt
+++ b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FetchFileResourceInfoDatabase.kt
@@ -1,6 +1,6 @@
 package com.tonyodev.fetch2fileserver.database
 
-import android.arch.persistence.room.*
+import androidx.room.*
 import android.content.Context
 import java.io.Closeable
 
diff --git a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FileResourceInfo.kt b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FileResourceInfo.kt
index 533f7c01..5b00754e 100644
--- a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FileResourceInfo.kt
+++ b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FileResourceInfo.kt
@@ -1,9 +1,9 @@
 package com.tonyodev.fetch2fileserver.database
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.Index
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.PrimaryKey
 
 @Entity(tableName = FileResourceInfoDatabase.TABLE_NAME,
         indices = [(Index(value = [FileResourceInfoDatabase.COLUMN_NAME], unique = true)),
diff --git a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FileResourceInfoDao.kt b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FileResourceInfoDao.kt
index 60dfa5e4..1a8f864e 100644
--- a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FileResourceInfoDao.kt
+++ b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FileResourceInfoDao.kt
@@ -1,6 +1,6 @@
 package com.tonyodev.fetch2fileserver.database
 
-import android.arch.persistence.room.*
+import androidx.room.*
 import com.tonyodev.fetch2fileserver.database.FileResourceInfoDatabase.Companion.COLUMN_ID
 import com.tonyodev.fetch2fileserver.database.FileResourceInfoDatabase.Companion.COLUMN_NAME
 import com.tonyodev.fetch2fileserver.database.FileResourceInfoDatabase.Companion.TABLE_NAME
diff --git a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FileResourceInfoDatabase.kt b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FileResourceInfoDatabase.kt
index a5db4387..e8cea813 100644
--- a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FileResourceInfoDatabase.kt
+++ b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FileResourceInfoDatabase.kt
@@ -1,7 +1,7 @@
 package com.tonyodev.fetch2fileserver.database
 
-import android.arch.persistence.room.Database
-import android.arch.persistence.room.RoomDatabase
+import androidx.room.Database
+import androidx.room.RoomDatabase
 import com.tonyodev.fetch2fileserver.database.FileResourceInfoDatabase.Companion.DATABASE_VERSION
 
 @Database(entities = [FileResourceInfo::class], version = DATABASE_VERSION, exportSchema = false)
diff --git a/fetch2okhttp/build.gradle b/fetch2okhttp/build.gradle
index 0892f376..cec70178 100644
--- a/fetch2okhttp/build.gradle
+++ b/fetch2okhttp/build.gradle
@@ -27,7 +27,7 @@ android {
         versionCode library_version_code
         versionName library_version
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
     }
 
@@ -67,8 +67,8 @@ dependencies {
     api project(':fetch2core')
 
     testImplementation "junit:junit:$junit_version"
-    androidTestImplementation "com.android.support.test:runner:$test_runner_version"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$espresso_version"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }
 
 //publish {
diff --git a/fetch2rx/build.gradle b/fetch2rx/build.gradle
index 3a1c852f..6d9fc25f 100644
--- a/fetch2rx/build.gradle
+++ b/fetch2rx/build.gradle
@@ -26,7 +26,7 @@ android {
         versionCode library_version_code
         versionName library_version
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
     }
 
@@ -61,8 +61,8 @@ dependencies {
     api project(':fetch2')
 
     testImplementation "junit:junit:$junit_version"
-    androidTestImplementation "com.android.support.test:runner:$test_runner_version"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$espresso_version"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }
 
 //publish {
diff --git a/fetchmigrator/build.gradle b/fetchmigrator/build.gradle
index 6d33a811..6671cdff 100644
--- a/fetchmigrator/build.gradle
+++ b/fetchmigrator/build.gradle
@@ -26,7 +26,7 @@ android {
         versionCode library_version_code
         versionName library_version
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
     }
 
@@ -60,8 +60,8 @@ dependencies {
 
     testImplementation "junit:junit:$junit_version"
 
-    androidTestImplementation "com.android.support.test:runner:$test_runner_version"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$espresso_version"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }
 
 //publish {
diff --git a/fetchmigrator/src/main/java/com/tonyodev/fetchmigrator/FetchMigrator.kt b/fetchmigrator/src/main/java/com/tonyodev/fetchmigrator/FetchMigrator.kt
index ca5e9edc..1ba1402b 100644
--- a/fetchmigrator/src/main/java/com/tonyodev/fetchmigrator/FetchMigrator.kt
+++ b/fetchmigrator/src/main/java/com/tonyodev/fetchmigrator/FetchMigrator.kt
@@ -4,7 +4,7 @@ package com.tonyodev.fetchmigrator
 
 import android.content.Context
 import android.database.sqlite.SQLiteConstraintException
-import android.support.annotation.WorkerThread
+import androidx.annotation.WorkerThread
 import com.tonyodev.fetch2.database.FetchDatabaseManagerImpl
 import com.tonyodev.fetch2.database.DownloadDatabase
 import com.tonyodev.fetch2.database.DownloadInfo
diff --git a/gradle.properties b/gradle.properties
index aac7c9b4..9e6fce10 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 16315bf9..3eb21df4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
diff --git a/gradlew b/gradlew
old mode 100755
new mode 100644
diff --git a/jitpack.yml b/jitpack.yml
new file mode 100644
index 00000000..46c85291
--- /dev/null
+++ b/jitpack.yml
@@ -0,0 +1,2 @@
+jdk:
+  - openjdk11
\ No newline at end of file
diff --git a/sampleApp/build.gradle b/sampleApp/build.gradle
index 30b9bbd3..219a4b10 100644
--- a/sampleApp/build.gradle
+++ b/sampleApp/build.gradle
@@ -26,7 +26,7 @@ android {
         targetSdkVersion library_target_version
         versionCode 8
         versionName "2.6"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
@@ -48,10 +48,10 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "com.android.support:appcompat-v7:$android_support_version"
-    implementation "com.android.support.constraint:constraint-layout:$constraint_layout_version"
-    implementation "com.android.support:design:$android_support_version"
-    implementation "com.android.support:recyclerview-v7:$android_support_version"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
     implementation "io.reactivex.rxjava2:rxandroid:$rxAndroid2_version"
     implementation "io.reactivex.rxjava2:rxjava:$rxJava2_version"
@@ -64,6 +64,6 @@ dependencies {
     implementation project(':fetch2fileserver')
 
     testImplementation "junit:junit:$junit_version"
-    androidTestImplementation "com.android.support.test:runner:$test_runner_version"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$espresso_version"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }
diff --git a/sampleApp/src/androidTest/java/com/tonyodev/fetchapp/ExampleInstrumentedTest.kt b/sampleApp/src/androidTest/java/com/tonyodev/fetchapp/ExampleInstrumentedTest.kt
index 6223f92b..b9e83d31 100644
--- a/sampleApp/src/androidTest/java/com/tonyodev/fetchapp/ExampleInstrumentedTest.kt
+++ b/sampleApp/src/androidTest/java/com/tonyodev/fetchapp/ExampleInstrumentedTest.kt
@@ -1,7 +1,7 @@
 package com.tonyodev.fetchapp
 
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
 
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/sampleApp/src/main/AndroidManifest.xml b/sampleApp/src/main/AndroidManifest.xml
index 4de187b2..de1ce22b 100644
--- a/sampleApp/src/main/AndroidManifest.xml
+++ b/sampleApp/src/main/AndroidManifest.xml
@@ -17,21 +17,31 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:targetApi="n">
-        <activity android:name=".MainActivity">
+        <activity
+            android:exported="true"
+            android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".FragmentActivity" />
-        <activity android:name=".DownloadListActivity" />
         <activity
+            android:exported="false"
+            android:name=".FragmentActivity" />
+        <activity
+            android:exported="false"
+            android:name=".DownloadListActivity" />
+        <activity
+            android:exported="false"
             android:name=".GameFilesActivity"
             android:screenOrientation="landscape" />
-        <activity android:name=".SingleDownloadActivity" />
-        <activity android:name=".FailedMultiEnqueueActivity" />
-        <activity android:name=".FileServerActivity" />
+        <activity
+            android:exported="false" android:name=".SingleDownloadActivity" />
+        <activity
+            android:exported="false" android:name=".FailedMultiEnqueueActivity" />
+        <activity
+            android:exported="false" android:name=".FileServerActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/sampleApp/src/main/java/com/tonyodev/fetchapp/Data.java b/sampleApp/src/main/java/com/tonyodev/fetchapp/Data.java
index 83cd9aef..8f384b71 100644
--- a/sampleApp/src/main/java/com/tonyodev/fetchapp/Data.java
+++ b/sampleApp/src/main/java/com/tonyodev/fetchapp/Data.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.net.Uri;
 import android.os.Environment;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.tonyodev.fetch2.Priority;
 import com.tonyodev.fetch2.Request;
diff --git a/sampleApp/src/main/java/com/tonyodev/fetchapp/DownloadListActivity.java b/sampleApp/src/main/java/com/tonyodev/fetchapp/DownloadListActivity.java
index a4f59a61..570427c6 100644
--- a/sampleApp/src/main/java/com/tonyodev/fetchapp/DownloadListActivity.java
+++ b/sampleApp/src/main/java/com/tonyodev/fetchapp/DownloadListActivity.java
@@ -4,16 +4,15 @@
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SwitchCompat;
+import androidx.annotation.NonNull;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.SwitchCompat;
 import android.view.View;
 
 import com.tonyodev.fetch2.AbstractFetchListener;
-import com.tonyodev.fetch2.DefaultFetchNotificationManager;
 import com.tonyodev.fetch2.Download;
 import com.tonyodev.fetch2.Error;
 import com.tonyodev.fetch2core.Downloader;
diff --git a/sampleApp/src/main/java/com/tonyodev/fetchapp/FailedMultiEnqueueActivity.java b/sampleApp/src/main/java/com/tonyodev/fetchapp/FailedMultiEnqueueActivity.java
index 0d4e0b34..cabdb5db 100644
--- a/sampleApp/src/main/java/com/tonyodev/fetchapp/FailedMultiEnqueueActivity.java
+++ b/sampleApp/src/main/java/com/tonyodev/fetchapp/FailedMultiEnqueueActivity.java
@@ -1,9 +1,9 @@
 package com.tonyodev.fetchapp;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.tonyodev.fetch2.Fetch;
diff --git a/sampleApp/src/main/java/com/tonyodev/fetchapp/FileAdapter.java b/sampleApp/src/main/java/com/tonyodev/fetchapp/FileAdapter.java
index 593de28e..00a36ae5 100644
--- a/sampleApp/src/main/java/com/tonyodev/fetchapp/FileAdapter.java
+++ b/sampleApp/src/main/java/com/tonyodev/fetchapp/FileAdapter.java
@@ -4,10 +4,10 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/sampleApp/src/main/java/com/tonyodev/fetchapp/FileServerActivity.java b/sampleApp/src/main/java/com/tonyodev/fetchapp/FileServerActivity.java
index 256b2fa3..376003d0 100644
--- a/sampleApp/src/main/java/com/tonyodev/fetchapp/FileServerActivity.java
+++ b/sampleApp/src/main/java/com/tonyodev/fetchapp/FileServerActivity.java
@@ -4,9 +4,9 @@
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -19,7 +19,6 @@
 import com.tonyodev.fetch2.FetchListener;
 import com.tonyodev.fetch2.Priority;
 import com.tonyodev.fetch2.Request;
-import com.tonyodev.fetch2core.Extras;
 import com.tonyodev.fetch2core.FetchCoreUtils;
 import com.tonyodev.fetch2core.FileResource;
 import com.tonyodev.fetch2core.MutableExtras;
diff --git a/sampleApp/src/main/java/com/tonyodev/fetchapp/FragmentActivity.java b/sampleApp/src/main/java/com/tonyodev/fetchapp/FragmentActivity.java
index 2998a010..fce6b757 100644
--- a/sampleApp/src/main/java/com/tonyodev/fetchapp/FragmentActivity.java
+++ b/sampleApp/src/main/java/com/tonyodev/fetchapp/FragmentActivity.java
@@ -5,11 +5,11 @@
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.fragment.app.FragmentManager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.tonyodev.fetch2.AbstractFetchListener;
diff --git a/sampleApp/src/main/java/com/tonyodev/fetchapp/GameFilesActivity.java b/sampleApp/src/main/java/com/tonyodev/fetchapp/GameFilesActivity.java
index 2e1fde1b..18b5001c 100644
--- a/sampleApp/src/main/java/com/tonyodev/fetchapp/GameFilesActivity.java
+++ b/sampleApp/src/main/java/com/tonyodev/fetchapp/GameFilesActivity.java
@@ -5,11 +5,11 @@
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v4.util.ArrayMap;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.collection.ArrayMap;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ProgressBar;
diff --git a/sampleApp/src/main/java/com/tonyodev/fetchapp/MainActivity.java b/sampleApp/src/main/java/com/tonyodev/fetchapp/MainActivity.java
index 44464ee1..e4c0b307 100644
--- a/sampleApp/src/main/java/com/tonyodev/fetchapp/MainActivity.java
+++ b/sampleApp/src/main/java/com/tonyodev/fetchapp/MainActivity.java
@@ -5,9 +5,9 @@
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
diff --git a/sampleApp/src/main/java/com/tonyodev/fetchapp/ProgressFragment.java b/sampleApp/src/main/java/com/tonyodev/fetchapp/ProgressFragment.java
index 2d914d6f..d4b6e180 100644
--- a/sampleApp/src/main/java/com/tonyodev/fetchapp/ProgressFragment.java
+++ b/sampleApp/src/main/java/com/tonyodev/fetchapp/ProgressFragment.java
@@ -1,9 +1,9 @@
 package com.tonyodev.fetchapp;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/sampleApp/src/main/java/com/tonyodev/fetchapp/SingleDownloadActivity.java b/sampleApp/src/main/java/com/tonyodev/fetchapp/SingleDownloadActivity.java
index 76a73266..c9449b58 100644
--- a/sampleApp/src/main/java/com/tonyodev/fetchapp/SingleDownloadActivity.java
+++ b/sampleApp/src/main/java/com/tonyodev/fetchapp/SingleDownloadActivity.java
@@ -5,9 +5,9 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.TextView;
 
diff --git a/sampleApp/src/main/java/com/tonyodev/fetchapp/Utils.java b/sampleApp/src/main/java/com/tonyodev/fetchapp/Utils.java
index a22527d2..27817e15 100644
--- a/sampleApp/src/main/java/com/tonyodev/fetchapp/Utils.java
+++ b/sampleApp/src/main/java/com/tonyodev/fetchapp/Utils.java
@@ -3,7 +3,7 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.webkit.MimeTypeMap;
 
 import java.io.File;
diff --git a/sampleApp/src/main/res/layout/activity_download_list.xml b/sampleApp/src/main/res/layout/activity_download_list.xml
index 94799d96..fc01a414 100644
--- a/sampleApp/src/main/res/layout/activity_download_list.xml
+++ b/sampleApp/src/main/res/layout/activity_download_list.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/activity_main"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.SwitchCompat
+    <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/networkSwitch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -16,7 +16,7 @@
         app:layout_constraintTop_toTopOf="parent"
         android:layout_marginRight="16dp" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -26,4 +26,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/networkSwitch" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sampleApp/src/main/res/layout/activity_file_server.xml b/sampleApp/src/main/res/layout/activity_file_server.xml
index c7cf9d05..8c90ce9a 100644
--- a/sampleApp/src/main/res/layout/activity_file_server.xml
+++ b/sampleApp/src/main/res/layout/activity_file_server.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -14,4 +14,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/sampleApp/src/main/res/layout/activity_single_download.xml b/sampleApp/src/main/res/layout/activity_single_download.xml
index 8334b604..29723cd5 100644
--- a/sampleApp/src/main/res/layout/activity_single_download.xml
+++ b/sampleApp/src/main/res/layout/activity_single_download.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_single_download"
@@ -58,4 +58,4 @@
         app:layout_constraintTop_toBottomOf="@+id/etaTextView"
         tools:text="204 KB/s" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sampleApp/src/main/res/layout/download_item.xml b/sampleApp/src/main/res/layout/download_item.xml
index 021b72e5..0cfbfb82 100644
--- a/sampleApp/src/main/res/layout/download_item.xml
+++ b/sampleApp/src/main/res/layout/download_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -114,4 +114,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/sampleApp/src/main/res/layout/fragment_progress.xml b/sampleApp/src/main/res/layout/fragment_progress.xml
index 5c824216..da6b1c08 100644
--- a/sampleApp/src/main/res/layout/fragment_progress.xml
+++ b/sampleApp/src/main/res/layout/fragment_progress.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -37,4 +37,4 @@
         app:layout_constraintTop_toBottomOf="@+id/progressBar"
         tools:text="65%" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/serversampleapp/build/generated/source/r/debug/android/arch/core/R.java b/serversampleapp/build/generated/source/r/debug/android/arch/core/R.java
index d71a32ba..06a50990 100644
--- a/serversampleapp/build/generated/source/r/debug/android/arch/core/R.java
+++ b/serversampleapp/build/generated/source/r/debug/android/arch/core/R.java
@@ -4,7 +4,7 @@
  * gradle plugin from the resource data it found. It
  * should not be modified by hand.
  */
-package android.arch.core;
+package androidx.arch.core;
 
 public final class R {
 }
diff --git a/serversampleapp/build/generated/source/r/debug/android/arch/lifecycle/R.java b/serversampleapp/build/generated/source/r/debug/android/arch/lifecycle/R.java
index b0be5d73..930d80e4 100644
--- a/serversampleapp/build/generated/source/r/debug/android/arch/lifecycle/R.java
+++ b/serversampleapp/build/generated/source/r/debug/android/arch/lifecycle/R.java
@@ -4,7 +4,7 @@
  * gradle plugin from the resource data it found. It
  * should not be modified by hand.
  */
-package android.arch.lifecycle;
+package androidx.lifecycle;
 
 public final class R {
 }
diff --git a/serversampleapp/build/generated/source/r/debug/android/arch/lifecycle/livedata/core/R.java b/serversampleapp/build/generated/source/r/debug/android/arch/lifecycle/livedata/core/R.java
index 8998425e..736e8612 100644
--- a/serversampleapp/build/generated/source/r/debug/android/arch/lifecycle/livedata/core/R.java
+++ b/serversampleapp/build/generated/source/r/debug/android/arch/lifecycle/livedata/core/R.java
@@ -4,7 +4,7 @@
  * gradle plugin from the resource data it found. It
  * should not be modified by hand.
  */
-package android.arch.lifecycle.livedata.core;
+package androidx.lifecycle.livedata.core;
 
 public final class R {
 }
diff --git a/serversampleapp/build/generated/source/r/debug/android/arch/lifecycle/viewmodel/R.java b/serversampleapp/build/generated/source/r/debug/android/arch/lifecycle/viewmodel/R.java
index 113673c5..7fa267f8 100644
--- a/serversampleapp/build/generated/source/r/debug/android/arch/lifecycle/viewmodel/R.java
+++ b/serversampleapp/build/generated/source/r/debug/android/arch/lifecycle/viewmodel/R.java
@@ -4,7 +4,7 @@
  * gradle plugin from the resource data it found. It
  * should not be modified by hand.
  */
-package android.arch.lifecycle.viewmodel;
+package androidx.lifecycle.viewmodel;
 
 public final class R {
 }
diff --git a/serversampleapp/build/generated/source/r/debug/android/arch/persistence/db/R.java b/serversampleapp/build/generated/source/r/debug/android/arch/persistence/db/R.java
index da363c10..6f5f09c6 100644
--- a/serversampleapp/build/generated/source/r/debug/android/arch/persistence/db/R.java
+++ b/serversampleapp/build/generated/source/r/debug/android/arch/persistence/db/R.java
@@ -4,7 +4,7 @@
  * gradle plugin from the resource data it found. It
  * should not be modified by hand.
  */
-package android.arch.persistence.db;
+package androidx.sqlite.db;
 
 public final class R {
 }
diff --git a/serversampleapp/build/generated/source/r/debug/android/arch/persistence/db/framework/R.java b/serversampleapp/build/generated/source/r/debug/android/arch/persistence/db/framework/R.java
index 29fa08b1..40bdc9b3 100644
--- a/serversampleapp/build/generated/source/r/debug/android/arch/persistence/db/framework/R.java
+++ b/serversampleapp/build/generated/source/r/debug/android/arch/persistence/db/framework/R.java
@@ -4,7 +4,7 @@
  * gradle plugin from the resource data it found. It
  * should not be modified by hand.
  */
-package android.arch.persistence.db.framework;
+package androidx.sqlite.db.framework;
 
 public final class R {
 }
diff --git a/serversampleapp/build/generated/source/r/debug/android/arch/persistence/room/R.java b/serversampleapp/build/generated/source/r/debug/android/arch/persistence/room/R.java
index f6b43420..262e6e39 100644
--- a/serversampleapp/build/generated/source/r/debug/android/arch/persistence/room/R.java
+++ b/serversampleapp/build/generated/source/r/debug/android/arch/persistence/room/R.java
@@ -4,7 +4,7 @@
  * gradle plugin from the resource data it found. It
  * should not be modified by hand.
  */
-package android.arch.persistence.room;
+package androidx.room;
 
 public final class R {
     public static final class attr {
diff --git a/serversampleapp/build/generated/source/r/debug/android/support/constraint/R.java b/serversampleapp/build/generated/source/r/debug/android/support/constraint/R.java
index d36e031c..39822f8b 100644
--- a/serversampleapp/build/generated/source/r/debug/android/support/constraint/R.java
+++ b/serversampleapp/build/generated/source/r/debug/android/support/constraint/R.java
@@ -4,7 +4,7 @@
  * gradle plugin from the resource data it found. It
  * should not be modified by hand.
  */
-package android.support.constraint;
+package androidx.constraintlayout;
 
 public final class R {
     public static final class attr {
diff --git a/serversampleapp/build/generated/source/r/debug/android/support/graphics/drawable/R.java b/serversampleapp/build/generated/source/r/debug/android/support/graphics/drawable/R.java
index b7f2ad08..3ea2082b 100644
--- a/serversampleapp/build/generated/source/r/debug/android/support/graphics/drawable/R.java
+++ b/serversampleapp/build/generated/source/r/debug/android/support/graphics/drawable/R.java
@@ -4,7 +4,7 @@
  * gradle plugin from the resource data it found. It
  * should not be modified by hand.
  */
-package android.support.graphics.drawable;
+package androidx.vectordrawable.graphics.drawable;
 
 public final class R {
     public static final class attr {
diff --git a/serversampleapp/build/generated/source/r/debug/android/support/graphics/drawable/animated/R.java b/serversampleapp/build/generated/source/r/debug/android/support/graphics/drawable/animated/R.java
index 755ae38a..4e93c01b 100644
--- a/serversampleapp/build/generated/source/r/debug/android/support/graphics/drawable/animated/R.java
+++ b/serversampleapp/build/generated/source/r/debug/android/support/graphics/drawable/animated/R.java
@@ -4,7 +4,7 @@
  * gradle plugin from the resource data it found. It
  * should not be modified by hand.
  */
-package android.support.graphics.drawable.animated;
+package androidx.vectordrawable.graphics.drawable.animated;
 
 public final class R {
     public static final class attr {
diff --git a/serversampleapp/build/generated/source/r/debug/android/support/v7/appcompat/R.java b/serversampleapp/build/generated/source/r/debug/android/support/v7/appcompat/R.java
index 9eb5cce5..2d697731 100644
--- a/serversampleapp/build/generated/source/r/debug/android/support/v7/appcompat/R.java
+++ b/serversampleapp/build/generated/source/r/debug/android/support/v7/appcompat/R.java
@@ -4,7 +4,7 @@
  * gradle plugin from the resource data it found. It
  * should not be modified by hand.
  */
-package android.support.v7.appcompat;
+package androidx.appcompat.appcompat;
 
 public final class R {
     public static final class anim {
diff --git a/versions.gradle b/versions.gradle
index deeb985b..6dfa9545 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -10,9 +10,9 @@ ext {
     test_runner_version = '1.0.1'
     library_min_version = '14'
     library_compile_version = 30
-    library_target_version = 30
+    library_target_version = 32
     library_build_tools_version = "30.0.3"
-    gradle_tools_version = '3.4.1'
+    gradle_tools_version = '7.0.4'
     rxJava2_version = "2.2.20"
     rxAndroid2_version = "2.1.1"
     timber_version = "4.7.1"