diff --git a/.github/workflows/BuildTest.yml b/.github/workflows/BuildTest.yml
new file mode 100644
index 0000000..14f6a83
--- /dev/null
+++ b/.github/workflows/BuildTest.yml
@@ -0,0 +1,129 @@
+name: Build and Test
+
+on:
+
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]  
+    
+  workflow_dispatch:
+
+
+jobs:
+
+  local_test_job:
+    name: Running Local Tests
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Print Java version
+        run: javac -version
+      - name: Change wrapper permissions
+        run: chmod +x ./gradlew
+      - name: Restore Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+                        
+      - name: Touch local properties
+        run: touch local.properties
+      - name: Add Api Key
+        run: echo "apiKey=\"\"" >> local.properties   
+
+      - name: Run Debug Tests
+        run: ./gradlew testDebugUnitTest --continue
+      - name: Upload Test Reports
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: test-reports
+          path: 'app/build/reports/tests/'
+
+  android_test_job:
+    name: Android Tests
+    runs-on: macos-latest
+    continue-on-error: true
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Print Java version
+        run: javac -version  
+      - name: Change wrapper permissions
+        run: chmod +x ./gradlew
+      - name: Restore Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+                        
+      - name: Touch local properties
+        run: touch local.properties
+      - name: Add Api Key
+        run: echo "apiKey=\"\"" >> local.properties   
+        
+      - name: Instrumentation Tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 29
+          script: ./gradlew connectedAndroidTest
+
+      - name: Upload Android Test Reports
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: android-test-reports
+          path: 'app/build/reports/androidTests/'
+
+  build_job:
+    name: Building the APK
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Restore Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Change wrapper permissions
+        run: chmod +x ./gradlew
+        
+                    
+      - name: Touch local properties
+        run: touch local.properties
+      - name: Add Api Key
+        run: echo "apiKey=\"\"" >> local.properties   
+        
+      - name: Assemble Debug
+        run: ./gradlew assembleDebug
+
+      - name: Upload APK
+        uses: actions/upload-artifact@v2
+        with:
+          name: InfiniteCycleViewPagerAPK
+          path: app/build/outputs/apk/debug/**.apk
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 4a61183..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-icvp
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 96cc43e..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0312fac..cf1a672 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,9 +3,10 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="D:\Programs\Programming\AndroidStudio\AS\gradle\gradle-2.14.1" />
+        <option name="gradleJvm" value="Android Studio default JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -13,13 +14,6 @@
             <option value="$PROJECT_DIR$/infinitecycleviewpager" />
           </set>
         </option>
-        <option name="myModules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/infinitecycleviewpager" />
-          </set>
-        </option>
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d5124e1..4e9f5b2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,36 +5,41 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="12">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
+          <item index="7" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="9" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="11" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="11">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="5" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="6" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="10" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index a1f689f..c65cc42 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,10 +2,15 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/InfiniteCycleViewPager.iml" filepath="$PROJECT_DIR$/InfiniteCycleViewPager.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/icvp.iml" filepath="$PROJECT_DIR$/icvp.iml" />
-      <module fileurl="file://$PROJECT_DIR$/infinitecycleviewpager/infinitecycleviewpager.iml" filepath="$PROJECT_DIR$/infinitecycleviewpager/infinitecycleviewpager.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/InfiniteCycleViewPager.iml" filepath="$PROJECT_DIR$/.idea/modules/InfiniteCycleViewPager.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/InfiniteCycleViewPager.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/InfiniteCycleViewPager.app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/InfiniteCycleViewPager.app.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/InfiniteCycleViewPager.app.androidTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/InfiniteCycleViewPager.app.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app/InfiniteCycleViewPager.app.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/InfiniteCycleViewPager.app.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/InfiniteCycleViewPager.app.unitTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/infinitecycleviewpager/InfiniteCycleViewPager.infinitecycleviewpager.iml" filepath="$PROJECT_DIR$/.idea/modules/infinitecycleviewpager/InfiniteCycleViewPager.infinitecycleviewpager.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/infinitecycleviewpager/InfiniteCycleViewPager.infinitecycleviewpager.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/infinitecycleviewpager/InfiniteCycleViewPager.infinitecycleviewpager.androidTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/infinitecycleviewpager/InfiniteCycleViewPager.infinitecycleviewpager.main.iml" filepath="$PROJECT_DIR$/.idea/modules/infinitecycleviewpager/InfiniteCycleViewPager.infinitecycleviewpager.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/infinitecycleviewpager/InfiniteCycleViewPager.infinitecycleviewpager.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/infinitecycleviewpager/InfiniteCycleViewPager.infinitecycleviewpager.unitTest.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 5f66515..0294706 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,16 +3,18 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1"
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.2'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a4228fe..79ff5d7 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-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip