Merge pull request #6 from zeoflow/version-resolver

Added flow-kit as dependency
zeoflow · Oct 8, 2020 · a408c54 · a408c54
2 parents ca81e5d + 04b38c3
commit a408c54
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 68 deletions.
diff --git a/anidero/build.gradle b/anidero/build.gradle
@@ -1,43 +1,36 @@
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion rootProject.ext.compileSdkVersion
-  buildToolsVersion rootProject.ext.buildToolsVersion
-  defaultConfig {
-    minSdkVersion rootProject.ext.minSdkVersion
-    targetSdkVersion rootProject.ext.targetSdkVersion
-    versionCode rootProject.ext.versionCode
-    versionName rootProject.ext.versionName
-    vectorDrawables.useSupportLibrary = true
-  }
-  lintOptions {
-    abortOnError true
-    textReport true
-    textOutput 'stdout'
-  }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_7
-    targetCompatibility JavaVersion.VERSION_1_7
-  }
-  testOptions {
-    unitTests {
-      includeAndroidResources = true
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode rootProject.ext.versionCode
+        versionName rootProject.ext.versionName
+        vectorDrawables.useSupportLibrary = true
+    }
+    lintOptions {
+        abortOnError true
+        textReport true
+        textOutput 'stdout'
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
-  }
 }
 
 dependencies {
 
-  implementation androidx.appcompat
-  implementation androidx.browser
-  implementation androidx.cardview
-  implementation androidx.constraintlayout
-  implementation androidx.exifinterface
-  implementation androidx.recyclerview
-  implementation androidx.transition
+    implementation 'com.zeoflow:material-elements:2.1.0'
+
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.core:core:1.3.2'
+
+    implementation 'com.squareup.okio:okio:2.8.0'
+    annotationProcessor "com.uber.nullaway:nullaway:0.7.5"
 
-  implementation 'com.squareup.okio:okio:2.6.0'
-  annotationProcessor "com.uber.nullaway:nullaway:0.7.5"
 }
 
 apply from: "${rootProject.projectDir}/anidero/maven-push.gradle"

diff --git a/anidero/gradle.properties b/anidero/gradle.properties
@@ -2,8 +2,8 @@ POM_NAME=Anidero
 POM_ARTIFACT_ID=anidero
 POM_PACKAGING=aar
 
-VERSION_NAME=1.0.0
-VERSION_CODE=1
+VERSION_NAME=1.0.1
+VERSION_CODE=2
 GROUP=com.zeoflow
 
 POM_DESCRIPTION=An Android Library that renders After Effects animations in JSON format

diff --git a/anidero/maven-push.gradle b/anidero/maven-push.gradle
@@ -40,6 +40,8 @@ def getRepositoryPassword() {
 }
 
 afterEvaluate { project ->
+  project.generateDebugBuildConfig.enabled = false
+  project.generateReleaseBuildConfig.enabled = false
   uploadArchives {
     repositories {
       mavenDeployer {

diff --git a/anidero/src/main/java/com/zeoflow/anidero/AnideroAnimationView.java b/anidero/src/main/java/com/zeoflow/anidero/AnideroAnimationView.java
@@ -23,7 +23,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RawRes;
-import androidx.appcompat.widget.AppCompatImageView;
 import androidx.core.view.ViewCompat;
 
 import com.zeoflow.anidero.model.KeyPath;
@@ -33,6 +32,7 @@
 import com.zeoflow.anidero.value.AnideroFrameInfo;
 import com.zeoflow.anidero.value.AnideroValueCallback;
 import com.zeoflow.anidero.value.SimpleAnideroValueCallback;
+import com.zeoflow.material.elements.imageview.MaterialImageView;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -63,7 +63,8 @@
  *
  * @see <a href="http://airbnb.io/anidero">Full Documentation</a>
  */
-@SuppressWarnings({"unused", "WeakerAccess"}) public class AnideroAnimationView extends AppCompatImageView {
+@SuppressWarnings({"unused", "WeakerAccess"}) public class AnideroAnimationView extends MaterialImageView
+{
 
   private static final String TAG = AnideroAnimationView.class.getSimpleName();
   private static final AnideroListener<Throwable> DEFAULT_FAILURE_LISTENER = new AnideroListener<Throwable>() {

diff --git a/anidero/src/main/java/com/zeoflow/anidero/Cancellable.java b/anidero/src/main/java/com/zeoflow/anidero/Cancellable.java
@@ -1,6 +1,5 @@
 package com.zeoflow.anidero;
 
-@Deprecated
 public interface Cancellable {
   void cancel();
 }
diff --git a/anidero/src/main/java/com/zeoflow/anidero/OnCompositionLoadedListener.java b/anidero/src/main/java/com/zeoflow/anidero/OnCompositionLoadedListener.java
@@ -6,7 +6,6 @@
  * @see AnideroCompositionFactory
  * @see AnideroResult
  */
-@Deprecated
 public interface OnCompositionLoadedListener {
   /**
    * Composition will be null if there was an error loading it. Check logcat for more details.

diff --git a/build.gradle b/build.gradle
@@ -36,27 +36,8 @@ task clean(type: Delete) {
 ext {
 	compileSdkVersion = 30
 	buildToolsVersion = '30.0.1'
-	minSdkVersion = 16
+	minSdkVersion = 21
 	targetSdkVersion = 30
-	versionCode = 1
-	versionName = "1.0.0"
-
-	androidx = [
-			annotation            : 'androidx.annotation:annotation:1.0.1',
-			appcompat             : 'androidx.appcompat:appcompat:1.2.0',
-			browser               : 'androidx.browser:browser:1.2.0',
-			cardview              : 'androidx.cardview:cardview:1.0.0',
-			constraintlayout      : 'androidx.constraintlayout:constraintlayout:1.1.3',
-			coordinatorlayout     : 'androidx.coordinatorlayout:coordinatorlayout:1.1.0',
-			core                  : 'androidx.core:core:1.2.0',
-			exifinterface         : 'androidx.exifinterface:exifinterface:1.3.0-alpha01',
-			experiemntal          : 'androidx.annotation:annotation-experimental:1.0.0',
-			fragment              : 'androidx.fragment:fragment:1.0.0',
-			lifecycle_runtime     : 'androidx.lifecycle:lifecycle-runtime:2.0.0',
-			recyclerview          : 'androidx.recyclerview:recyclerview:1.1.0',
-			recyclerview_selection: 'androidx.recyclerview:recyclerview-selection:1.0.0',
-			transition            : 'androidx.transition:transition:1.4.0-beta01',
-			vectordrawable        : 'androidx.vectordrawable:vectordrawable:1.1.0',
-			viewpager2            : 'androidx.viewpager2:viewpager2:1.0.0'
-	]
+	versionCode = 2
+	versionName = "1.0.1"
 }
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -31,14 +31,7 @@ android {
 
 dependencies {
 	implementation fileTree(dir: "libs", include: ["*.jar"])
-
-	implementation androidx.appcompat
-	implementation androidx.browser
-	implementation androidx.cardview
-	implementation androidx.constraintlayout
-	implementation androidx.exifinterface
-	implementation androidx.recyclerview
-	implementation androidx.transition
+	implementation 'com.zeoflow:flow-kit:1.1.1'
 
 	implementation project(':anidero')
 

diff --git a/sample/src/main/java/com/zeoflow/anidero/sample/MainActivity.java b/sample/src/main/java/com/zeoflow/anidero/sample/MainActivity.java
@@ -6,8 +6,9 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.zeoflow.anidero.AnideroAnimationView;
+import com.zeoflow.compat.ActivityCore;
 
-public class MainActivity extends AppCompatActivity
+public class MainActivity extends ActivityCore
 {
 
     @Override