bkhall · juanitobananas · Mar 6, 2020 · Mar 6, 2020 · Mar 6, 2020 · Mar 6, 2020
diff --git a/.gitignore b/.gitignore
@@ -162,3 +162,16 @@ pip-log.txt
 
 # Mac crap
 .DS_Store
+
+#################
+## Android Studio
+#################
+
+*.iml
+.gradle
+/local.properties
+.idea
+.DS_Store
+/build
+/captures
+
diff --git a/build.gradle b/build.gradle
@@ -0,0 +1,17 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.5.3'
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Fri Mar 06 07:15:10 CET 2020
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/mediautil/build.gradle b/mediautil/build.gradle
@@ -0,0 +1,20 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.2"
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0~1"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
diff --git a/AndroidManifest.xml → mediautil/src/main/AndroidManifest.xml b/AndroidManifest.xml → mediautil/src/main/AndroidManifest.xml
@@ -2,9 +2,4 @@
     package="android.mediautil"
     android:versionCode="1"
     android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="17" />
-
 </manifest>
diff --git a/src/android/mediautil/MediaUtil.java → ...ain/java/android/mediautil/MediaUtil.java b/src/android/mediautil/MediaUtil.java → ...ain/java/android/mediautil/MediaUtil.java
diff --git a/src/android/mediautil/generic/BasicIo.java → ...va/android/mediautil/generic/BasicIo.java b/src/android/mediautil/generic/BasicIo.java → ...va/android/mediautil/generic/BasicIo.java
diff --git a/...ediautil/generic/FileFormatException.java → ...ediautil/generic/FileFormatException.java b/...ediautil/generic/FileFormatException.java → ...ediautil/generic/FileFormatException.java
diff --git a/src/android/mediautil/generic/Log.java → ...n/java/android/mediautil/generic/Log.java b/src/android/mediautil/generic/Log.java → ...n/java/android/mediautil/generic/Log.java
diff --git a/...d/mediautil/generic/ProgressCallback.java → ...d/mediautil/generic/ProgressCallback.java b/...d/mediautil/generic/ProgressCallback.java → ...d/mediautil/generic/ProgressCallback.java
diff --git a/src/android/mediautil/generic/Rational.java → ...a/android/mediautil/generic/Rational.java b/src/android/mediautil/generic/Rational.java → ...a/android/mediautil/generic/Rational.java
diff --git a/...til/generic/directio/IterativeReader.java → ...til/generic/directio/IterativeReader.java b/...til/generic/directio/IterativeReader.java → ...til/generic/directio/IterativeReader.java
diff --git a/...til/generic/directio/IterativeWriter.java → ...til/generic/directio/IterativeWriter.java b/...til/generic/directio/IterativeWriter.java → ...til/generic/directio/IterativeWriter.java
diff --git a/...diautil/image/jpeg/AbstractImageInfo.java → ...diautil/image/jpeg/AbstractImageInfo.java b/...diautil/image/jpeg/AbstractImageInfo.java → ...diautil/image/jpeg/AbstractImageInfo.java
diff --git a/...d/mediautil/image/jpeg/AdvancedImage.java → ...d/mediautil/image/jpeg/AdvancedImage.java b/...d/mediautil/image/jpeg/AdvancedImage.java → ...d/mediautil/image/jpeg/AdvancedImage.java
diff --git a/...oid/mediautil/image/jpeg/BasicJpegIo.java → ...oid/mediautil/image/jpeg/BasicJpegIo.java b/...oid/mediautil/image/jpeg/BasicJpegIo.java → ...oid/mediautil/image/jpeg/BasicJpegIo.java
diff --git a/src/android/mediautil/image/jpeg/CIFF.java → ...va/android/mediautil/image/jpeg/CIFF.java b/src/android/mediautil/image/jpeg/CIFF.java → ...va/android/mediautil/image/jpeg/CIFF.java
diff --git a/src/android/mediautil/image/jpeg/Entry.java → ...a/android/mediautil/image/jpeg/Entry.java b/src/android/mediautil/image/jpeg/Entry.java → ...a/android/mediautil/image/jpeg/Entry.java
diff --git a/src/android/mediautil/image/jpeg/Exif.java → ...va/android/mediautil/image/jpeg/Exif.java b/src/android/mediautil/image/jpeg/Exif.java → ...va/android/mediautil/image/jpeg/Exif.java
diff --git a/...ndroid/mediautil/image/jpeg/Flashpix.java → ...ndroid/mediautil/image/jpeg/Flashpix.java b/...ndroid/mediautil/image/jpeg/Flashpix.java → ...ndroid/mediautil/image/jpeg/Flashpix.java
diff --git a/src/android/mediautil/image/jpeg/IFD.java → ...ava/android/mediautil/image/jpeg/IFD.java b/src/android/mediautil/image/jpeg/IFD.java → ...ava/android/mediautil/image/jpeg/IFD.java
diff --git a/...autil/image/jpeg/IFDParsingException.java → ...autil/image/jpeg/IFDParsingException.java b/...autil/image/jpeg/IFDParsingException.java → ...autil/image/jpeg/IFDParsingException.java
diff --git a/src/android/mediautil/image/jpeg/JFXX.java → ...va/android/mediautil/image/jpeg/JFXX.java b/src/android/mediautil/image/jpeg/JFXX.java → ...va/android/mediautil/image/jpeg/JFXX.java
diff --git a/src/android/mediautil/image/jpeg/JPEG.java → ...va/android/mediautil/image/jpeg/JPEG.java b/src/android/mediautil/image/jpeg/JPEG.java → ...va/android/mediautil/image/jpeg/JPEG.java
diff --git a/...android/mediautil/image/jpeg/LLJTran.java → ...android/mediautil/image/jpeg/LLJTran.java b/...android/mediautil/image/jpeg/LLJTran.java → ...android/mediautil/image/jpeg/LLJTran.java
diff --git a/...ediautil/image/jpeg/LLJTranException.java → ...ediautil/image/jpeg/LLJTranException.java b/...ediautil/image/jpeg/LLJTranException.java → ...ediautil/image/jpeg/LLJTranException.java
diff --git a/src/android/mediautil/image/jpeg/Naming.java → .../android/mediautil/image/jpeg/Naming.java b/src/android/mediautil/image/jpeg/Naming.java → .../android/mediautil/image/jpeg/Naming.java
diff --git a/src/android/mediautil/image/jpeg/Record.java → .../android/mediautil/image/jpeg/Record.java b/src/android/mediautil/image/jpeg/Record.java → .../android/mediautil/image/jpeg/Record.java
diff --git a/...ndroid/mediautil/image/jpeg/TiffExif.java → ...ndroid/mediautil/image/jpeg/TiffExif.java b/...ndroid/mediautil/image/jpeg/TiffExif.java → ...ndroid/mediautil/image/jpeg/TiffExif.java
diff --git a/...age/jpeg/maker/BlockMakerNoteHandler.java → ...age/jpeg/maker/BlockMakerNoteHandler.java b/...age/jpeg/maker/BlockMakerNoteHandler.java → ...age/jpeg/maker/BlockMakerNoteHandler.java
diff --git a/...util/image/jpeg/maker/GenericHandler.java → ...util/image/jpeg/maker/GenericHandler.java b/...util/image/jpeg/maker/GenericHandler.java → ...util/image/jpeg/maker/GenericHandler.java
diff --git a/...image/jpeg/maker/IFDMakerNoteHandler.java → ...image/jpeg/maker/IFDMakerNoteHandler.java b/...image/jpeg/maker/IFDMakerNoteHandler.java → ...image/jpeg/maker/IFDMakerNoteHandler.java
diff --git a/...il/image/jpeg/maker/MakerNoteHandler.java → ...il/image/jpeg/maker/MakerNoteHandler.java b/...il/image/jpeg/maker/MakerNoteHandler.java → ...il/image/jpeg/maker/MakerNoteHandler.java
diff --git a/...e/jpeg/maker/MakerNoteHandlerFactory.java → ...e/jpeg/maker/MakerNoteHandlerFactory.java b/...e/jpeg/maker/MakerNoteHandlerFactory.java → ...e/jpeg/maker/MakerNoteHandlerFactory.java
diff --git a/...g/maker/specific/CanonEos300dHandler.java → ...g/maker/specific/CanonEos300dHandler.java b/...g/maker/specific/CanonEos300dHandler.java → ...g/maker/specific/CanonEos300dHandler.java
diff --git a/...g/maker/specific/CanonGenericHandler.java → ...g/maker/specific/CanonGenericHandler.java b/...g/maker/specific/CanonGenericHandler.java → ...g/maker/specific/CanonGenericHandler.java
diff --git a/res/xml/makernote.xml → mediautil/src/main/res/xml/makernote.xml b/res/xml/makernote.xml → mediautil/src/main/res/xml/makernote.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   MediaUtil LLJTran - $RCSfile: MakerNote.xml,v $
   Copyright (C) 1999-2005 Dmitriy Rogatkin, Suresh Mahalingam.  All rights reserved.

diff --git a/project.properties b/project.properties
diff --git a/settings.gradle b/settings.gradle
@@ -0,0 +1 @@
+include ':mediautil'