diff --git a/build.gradle b/build.gradle
index 849b132..06c2441 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,24 +1,20 @@
 buildscript {
     repositories {
         mavenCentral()
+        google()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.6.+'
+        classpath 'com.android.tools.build:gradle:8.7.3'
     }
 }
 
-def isReleaseBuild() {
-    return version.contains("SNAPSHOT") == false
-}
-
 allprojects {
     version = VERSION_NAME
     group = GROUP
 
     repositories {
         mavenCentral()
+        google()
     }
 }
-
-apply plugin: 'android-reporting'
diff --git a/gradle.properties b/gradle.properties
index 8c0f0b9..35376e2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,3 @@
 VERSION_NAME=1.1.0
 GROUP=se.emilsjolander
-
-POM_DESCRIPTION=android-FlipView is an easy to use android library for implementing flipping between views as seen in the popular Flipboard application
-POM_URL=https://github.com/emilsjolander/android-FlipView
-POM_SCM_URL=https://github.com/emilsjolander/android-FlipView
-POM_SCM_CONNECTION=scm:git:git://github.com/emilsjolander/android-FlipView.git
-POM_SCM_DEV_CONNECTION=scm:git:git://github.com/emilsjolander/android-FlipView.git
-POM_LICENCE_NAME=The Apache Software License, Version 2.0
-POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
-POM_LICENCE_DIST=repo
-POM_DEVELOPER_ID=emilsjolander
-POM_DEVELOPER_NAME=Emil Sjolander
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e77c709..b8a3312 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Nov 02 21:55:43 CET 2013
+#Mon Mar 03 09:05:14 JST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-all.zip
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/jitpack.yml b/jitpack.yml
new file mode 100644
index 0000000..1e41e00
--- /dev/null
+++ b/jitpack.yml
@@ -0,0 +1,2 @@
+jdk:
+  - openjdk17
\ No newline at end of file
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
deleted file mode 100644
index f43cd67..0000000
--- a/library/AndroidManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="se.emilsjolander.flipview"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="11"
-        android:targetSdkVersion="19" />
-
-</manifest>
\ No newline at end of file
diff --git a/library/build.gradle b/library/build.gradle
index fe21752..d6c5e59 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,23 +1,52 @@
-apply plugin: 'android-library'
-
-repositories {
-    mavenCentral()
-}
-dependencies {
-    compile 'com.android.support:support-v4:18.0.0'
+plugins {
+    id 'com.android.library'
+    id 'maven-publish'
 }
 
 android {
-    compileSdkVersion 18
-    buildToolsVersion '18.1.1'
-
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            res.srcDirs = ['res']
+    compileSdk 34
+    namespace 'se.emilsjolander.flipview'
+
+    defaultConfig {
+        minSdk 11
+    }
+
+    buildTypes {
+        debug {
+            minifyEnabled false
+        }
+        release {
+            minifyEnabled false
         }
     }
+
+    publishing {
+        // Publish as an AAB.
+        singleVariant('release')
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+}
+
+dependencies {
+    implementation 'com.android.support:support-v4:18.0.0'
 }
 
-apply from: '../maven_push.gradle'
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                groupId = GROUP
+                artifactId = 'android-FlipView'
+                version = VERSION_NAME
+
+                afterEvaluate {
+                    from components.release
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/library/libs/android-support-v4.jar b/library/libs/android-support-v4.jar
deleted file mode 100644
index cf12d28..0000000
Binary files a/library/libs/android-support-v4.jar and /dev/null differ
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..44008a4
--- /dev/null
+++ b/library/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest>
+
+</manifest>
\ No newline at end of file
diff --git a/library/src/se/emilsjolander/flipview/FlipView.java b/library/src/main/java/se/emilsjolander/flipview/FlipView.java
similarity index 99%
rename from library/src/se/emilsjolander/flipview/FlipView.java
rename to library/src/main/java/se/emilsjolander/flipview/FlipView.java
index 2e872bc..89c6c93 100644
--- a/library/src/se/emilsjolander/flipview/FlipView.java
+++ b/library/src/main/java/se/emilsjolander/flipview/FlipView.java
@@ -167,7 +167,7 @@ public FlipView(Context context, AttributeSet attrs, int defStyle) {
 				R.styleable.FlipView);
 
 		// 0 is vertical, 1 is horizontal
-		mIsFlippingVertically = a.getInt(R.styleable.FlipView_orientation,
+		mIsFlippingVertically = a.getInt(R.styleable.FlipView_android_orientation,
 				VERTICAL_FLIP) == VERTICAL_FLIP;
 
 		setOverFlipMode(OverFlipMode.values()[a.getInt(
diff --git a/library/src/se/emilsjolander/flipview/GlowOverFlipper.java b/library/src/main/java/se/emilsjolander/flipview/GlowOverFlipper.java
similarity index 100%
rename from library/src/se/emilsjolander/flipview/GlowOverFlipper.java
rename to library/src/main/java/se/emilsjolander/flipview/GlowOverFlipper.java
diff --git a/library/src/se/emilsjolander/flipview/OverFlipMode.java b/library/src/main/java/se/emilsjolander/flipview/OverFlipMode.java
similarity index 100%
rename from library/src/se/emilsjolander/flipview/OverFlipMode.java
rename to library/src/main/java/se/emilsjolander/flipview/OverFlipMode.java
diff --git a/library/src/se/emilsjolander/flipview/OverFlipper.java b/library/src/main/java/se/emilsjolander/flipview/OverFlipper.java
similarity index 100%
rename from library/src/se/emilsjolander/flipview/OverFlipper.java
rename to library/src/main/java/se/emilsjolander/flipview/OverFlipper.java
diff --git a/library/src/se/emilsjolander/flipview/OverFlipperFactory.java b/library/src/main/java/se/emilsjolander/flipview/OverFlipperFactory.java
similarity index 100%
rename from library/src/se/emilsjolander/flipview/OverFlipperFactory.java
rename to library/src/main/java/se/emilsjolander/flipview/OverFlipperFactory.java
diff --git a/library/src/se/emilsjolander/flipview/Recycler.java b/library/src/main/java/se/emilsjolander/flipview/Recycler.java
similarity index 100%
rename from library/src/se/emilsjolander/flipview/Recycler.java
rename to library/src/main/java/se/emilsjolander/flipview/Recycler.java
diff --git a/library/src/se/emilsjolander/flipview/RubberBandOverFlipper.java b/library/src/main/java/se/emilsjolander/flipview/RubberBandOverFlipper.java
similarity index 100%
rename from library/src/se/emilsjolander/flipview/RubberBandOverFlipper.java
rename to library/src/main/java/se/emilsjolander/flipview/RubberBandOverFlipper.java
diff --git a/library/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
similarity index 65%
rename from library/res/values/attrs.xml
rename to library/src/main/res/values/attrs.xml
index a022bc7..48a176d 100644
--- a/library/res/values/attrs.xml
+++ b/library/src/main/res/values/attrs.xml
@@ -2,10 +2,7 @@
 <resources>
     
     <declare-styleable name="FlipView">
-        <attr name="orientation" format="enum">
-            <enum name="vertical" value="0"/>
-            <enum name="horizontal" value="1"/>
-        </attr>
+        <attr name="android:orientation" />
         <attr name="overFlipMode" format="enum">
             <enum name="glow" value="0"/>
             <enum name="rubber_band" value="1"/>
diff --git a/library/res/values/strings.xml b/library/src/main/res/values/strings.xml
similarity index 100%
rename from library/res/values/strings.xml
rename to library/src/main/res/values/strings.xml
diff --git a/maven_push.gradle b/maven_push.gradle
deleted file mode 100644
index 02b0037..0000000
--- a/maven_push.gradle
+++ /dev/null
@@ -1,81 +0,0 @@
-apply plugin: 'maven'
-apply plugin: 'signing'
-
-if (isReleaseBuild()) {
-    println 'RELEASE BUILD'
-    sonatypeRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-} else {
-    println 'DEBUG BUILD'
-    sonatypeRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
-}
-
-afterEvaluate { project ->
-    uploadArchives {
-        repositories {
-            mavenDeployer {
-                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-                pom.artifactId = POM_ARTIFACT_ID
-
-                repository(url: sonatypeRepositoryUrl) {
-                    authentication(userName: SONATYPE_USERNAME, password: SONATYPE_PASSWORD)
-                }
-
-                pom.project {
-                    name POM_NAME
-                    packaging POM_PACKAGING
-                    description POM_DESCRIPTION
-                    url POM_URL
-
-                    scm {
-                        url POM_SCM_URL
-                        connection POM_SCM_CONNECTION
-                        developerConnection POM_SCM_DEV_CONNECTION
-                    }
-
-                    licenses {
-                        license {
-                            name POM_LICENCE_NAME
-                            url POM_LICENCE_URL
-                            distribution POM_LICENCE_DIST
-                        }
-                    }
-
-                    developers {
-                        developer {
-                            id POM_DEVELOPER_ID
-                            name POM_DEVELOPER_NAME
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    signing {
-        required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
-        sign configurations.archives
-    }
-
-    task androidJavadocs(type: Javadoc) {
-        source = android.sourceSets.main.allJava
-    }
-
-    task androidJavadocsJar(type: Jar) {
-        classifier = 'javadoc'
-        //basename = artifact_id
-        from androidJavadocs.destinationDir
-    }
-
-    task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
-        //basename = artifact_id
-        from android.sourceSets.main.allSource
-    }
-
-    artifacts {
-        //archives packageReleaseJar
-        archives androidSourcesJar
-        archives androidJavadocsJar
-    }
-}
diff --git a/sample/build.gradle b/sample/build.gradle
index fc087c1..76245a5 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -1,22 +1,34 @@
-apply plugin: 'android'
-
-repositories {
-    mavenCentral()
-}
-dependencies {
-    compile project(':library')
-    compile 'com.android.support:support-v4:18.0.0'
+plugins {
+    id 'com.android.application'
 }
 
 android {
-    compileSdkVersion 18
-    buildToolsVersion '18.0.1'
+    compileSdk 34
+    namespace 'se.emilsjolander.flipview.sample'
 
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            res.srcDirs = ['res']
+    defaultConfig {
+        applicationId 'se.emilsjolander.flipview.sample'
+        versionCode 1
+        versionName "1.0"
+        minSdk 11
+    }
+
+    buildTypes {
+        debug {
+            minifyEnabled false
+        }
+        release {
+            minifyEnabled false
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+}
+
+dependencies {
+    implementation project(':library')
+    implementation 'com.android.support:support-v4:18.0.0'
 }
diff --git a/sample/libs/android-support-v4.jar b/sample/libs/android-support-v4.jar
deleted file mode 100644
index 428bdbc..0000000
Binary files a/sample/libs/android-support-v4.jar and /dev/null differ
diff --git a/sample/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
similarity index 69%
rename from sample/AndroidManifest.xml
rename to sample/src/main/AndroidManifest.xml
index 18e6f72..66de8d9 100644
--- a/sample/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="se.emilsjolander.flipview"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="11"
-        android:targetSdkVersion="19" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
@@ -14,7 +7,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name="se.emilsjolander.flipview.MainActivity"
+            android:name="se.emilsjolander.flipview.sample.MainActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/sample/src/se/emilsjolander/flipview/FlipAdapter.java b/sample/src/main/java/se/emilsjolander/flipview/sample/FlipAdapter.java
similarity index 98%
rename from sample/src/se/emilsjolander/flipview/FlipAdapter.java
rename to sample/src/main/java/se/emilsjolander/flipview/sample/FlipAdapter.java
index 2abdd22..3227421 100644
--- a/sample/src/se/emilsjolander/flipview/FlipAdapter.java
+++ b/sample/src/main/java/se/emilsjolander/flipview/sample/FlipAdapter.java
@@ -1,7 +1,4 @@
-package se.emilsjolander.flipview;
-
-import java.util.ArrayList;
-import java.util.List;
+package se.emilsjolander.flipview.sample;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -12,6 +9,9 @@
 import android.widget.Button;
 import android.widget.TextView;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class FlipAdapter extends BaseAdapter implements OnClickListener {
 	
 	public interface Callback{
diff --git a/sample/src/se/emilsjolander/flipview/MainActivity.java b/sample/src/main/java/se/emilsjolander/flipview/sample/MainActivity.java
similarity index 90%
rename from sample/src/se/emilsjolander/flipview/MainActivity.java
rename to sample/src/main/java/se/emilsjolander/flipview/sample/MainActivity.java
index 4d3e371..78be1eb 100644
--- a/sample/src/se/emilsjolander/flipview/MainActivity.java
+++ b/sample/src/main/java/se/emilsjolander/flipview/sample/MainActivity.java
@@ -1,14 +1,17 @@
-package se.emilsjolander.flipview;
+package se.emilsjolander.flipview.sample;
 
-import se.emilsjolander.flipview.FlipAdapter.Callback;
-import se.emilsjolander.flipview.FlipView.OnFlipListener;
-import se.emilsjolander.flipview.FlipView.OnOverFlipListener;
 import android.app.Activity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import se.emilsjolander.flipview.sample.FlipAdapter.Callback;
+import se.emilsjolander.flipview.FlipView;
+import se.emilsjolander.flipview.FlipView.OnFlipListener;
+import se.emilsjolander.flipview.FlipView.OnOverFlipListener;
+import se.emilsjolander.flipview.OverFlipMode;
+
 public class MainActivity extends Activity implements Callback, OnFlipListener, OnOverFlipListener {
 	
 	private FlipView mFlipView;
diff --git a/sample/res/drawable-hdpi/ic_launcher.png b/sample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from sample/res/drawable-hdpi/ic_launcher.png
rename to sample/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/sample/res/drawable-mdpi/ic_launcher.png b/sample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from sample/res/drawable-mdpi/ic_launcher.png
rename to sample/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/sample/res/drawable-xhdpi/ic_launcher.png b/sample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from sample/res/drawable-xhdpi/ic_launcher.png
rename to sample/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/sample/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
similarity index 75%
rename from sample/res/layout/activity_main.xml
rename to sample/src/main/res/layout/activity_main.xml
index 65a6090..7e3fc33 100644
--- a/sample/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -1,14 +1,13 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:flipview="http://schemas.android.com/apk/res-auto" >
+    xmlns:tools="http://schemas.android.com/tools">
 
     <se.emilsjolander.flipview.FlipView
         android:id="@+id/flip_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="#ffffff"
-        flipview:orientation="vertical"
-        tools:context=".MainActivity" >
+        android:orientation="vertical"
+        tools:context="main.se.emilsjolander.flipview.se.emilsjolander.flipview.sample.MainActivity" >
     </se.emilsjolander.flipview.FlipView>
 
     <TextView
diff --git a/sample/res/layout/page.xml b/sample/src/main/res/layout/page.xml
similarity index 100%
rename from sample/res/layout/page.xml
rename to sample/src/main/res/layout/page.xml
diff --git a/sample/res/menu/activity_main.xml b/sample/src/main/res/menu/activity_main.xml
similarity index 100%
rename from sample/res/menu/activity_main.xml
rename to sample/src/main/res/menu/activity_main.xml
diff --git a/sample/res/values-v14/styles.xml b/sample/src/main/res/values-v14/styles.xml
similarity index 100%
rename from sample/res/values-v14/styles.xml
rename to sample/src/main/res/values-v14/styles.xml
diff --git a/sample/res/values/strings.xml b/sample/src/main/res/values/strings.xml
similarity index 100%
rename from sample/res/values/strings.xml
rename to sample/src/main/res/values/strings.xml
diff --git a/sample/res/values/style.xml b/sample/src/main/res/values/style.xml
similarity index 100%
rename from sample/res/values/style.xml
rename to sample/src/main/res/values/style.xml