Merge pull request #74 from trello/dlew/update-sample

Update sample for latest Victor release
trello-archive · May 8, 2020 · d7c8ede · d7c8ede
2 parents 8ed9aa5 + 1f38834
commit d7c8ede
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,8 +4,8 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-27.0.3
-    - android-25
+    - build-tools-28.0.3
+    - android-29
     - extra-android-m2repository
 
 jdk: oraclejdk8

diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:3.6.3'
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -15,4 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+
+android.useAndroidX=true
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.trello:victor:1.0.0'
+        classpath 'com.trello:victor:1.1.0'
     }
 }
 
@@ -42,6 +42,11 @@ android {
         vectorDrawables.useSupportLibrary = true
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     // Define the 'svg' source set for any flavors/build types and/or 'main' for all of them
     sourceSets {
         main {
@@ -68,5 +73,5 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:25.4.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
 }
diff --git a/sample/src/main/java/com/trello/victorsample/MainActivity.java b/sample/src/main/java/com/trello/victorsample/MainActivity.java
@@ -17,10 +17,11 @@
 package com.trello.victorsample;
 
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
 import android.widget.ImageView;
 
-public class MainActivity extends ActionBarActivity {
+import androidx.appcompat.app.AppCompatActivity;
+
+public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

diff --git a/settings.gradle b/settings.gradle
@@ -1,5 +1,2 @@
 include ':victor'
-
-// Temporarily exclude this sample, because it uses the published version of Victor
-// (which is incompatible with Gradle 6 atm).
-// include ':sample'
+include ':sample'