From 4c8b786662bfc3e6226ba6b54dcf4802395b1d39 Mon Sep 17 00:00:00 2001 From: Akexorcist Date: Sun, 15 Oct 2017 20:14:10 +0700 Subject: [PATCH 1/5] Update gradle plugin and dependency version --- adjustable-imageview/adjustable-imageview.iml | 30 ++++++++++--------- adjustable-imageview/build.gradle | 6 ++-- app/build.gradle | 8 ++--- build.gradle | 6 ++-- gradle/wrapper/gradle-wrapper.properties | 4 +-- 5 files changed, 29 insertions(+), 25 deletions(-) diff --git a/adjustable-imageview/adjustable-imageview.iml b/adjustable-imageview/adjustable-imageview.iml index 6e280c5..dfe3704 100644 --- a/adjustable-imageview/adjustable-imageview.iml +++ b/adjustable-imageview/adjustable-imageview.iml @@ -9,7 +9,6 @@ - + @@ -33,12 +32,14 @@ + + @@ -46,50 +47,51 @@ - + - + - + - + - - + + + - - + - + + + - - + \ No newline at end of file diff --git a/adjustable-imageview/build.gradle b/adjustable-imageview/build.gradle index 367954b..99b28af 100644 --- a/adjustable-imageview/build.gradle +++ b/adjustable-imageview/build.gradle @@ -25,12 +25,12 @@ ext { } android { - compileSdkVersion 23 - buildToolsVersion "23.0.2" + compileSdkVersion 26 + buildToolsVersion "26.0.2" defaultConfig { minSdkVersion 15 - targetSdkVersion 23 + targetSdkVersion 26 versionCode 1 versionName "1.0" } diff --git a/app/build.gradle b/app/build.gradle index a941eed..080b5c1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 26 + buildToolsVersion "26.0.2" defaultConfig { applicationId "com.inthecheesefactory.example.adjustableimageview" minSdkVersion 15 - targetSdkVersion 23 + targetSdkVersion 26 versionCode 1 versionName "1.0" } @@ -22,5 +22,5 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile project(':adjustable-imageview') - compile 'com.android.support:appcompat-v7:23.1.1' + compile 'com.android.support:appcompat-v7:26.1.0' } diff --git a/build.gradle b/build.gradle index fa5f896..fe9d15a 100644 --- a/build.gradle +++ b/build.gradle @@ -3,11 +3,12 @@ buildscript { repositories { jcenter() + maven { url 'https://maven.google.com' } } dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -17,5 +18,6 @@ buildscript { allprojects { repositories { jcenter() + maven { url 'https://maven.google.com' } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bb0e326..fe23da7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Nov 15 11:00:03 ICT 2015 +#Sun Oct 15 20:09:25 ICT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip From b3d0917903213d89a70fa462c27c4da0f6f1a6fb Mon Sep 17 00:00:00 2001 From: Akexorcist Date: Sun, 15 Oct 2017 20:14:46 +0700 Subject: [PATCH 2/5] Add fully gitignore --- .gitignore | 62 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 9c4de58..f23280a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,55 @@ -.gradle -/local.properties -/.idea/workspace.xml -/.idea/libraries -.DS_Store -/build -/captures +# Built application files +*.apk +*.ap_ + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# Intellij +*.iml +.idea/workspace.xml +.idea/tasks.xml +.idea/gradle.xml +.idea/dictionaries +.idea/libraries + +# Keystore files +*.jks + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild + +# Google Services (e.g. APIs or Firebase) +google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json \ No newline at end of file From 5ecbec483844b44982a32c679248e9c79954366f Mon Sep 17 00:00:00 2001 From: Akexorcist Date: Sun, 15 Oct 2017 20:15:33 +0700 Subject: [PATCH 3/5] Remove unneccessary resource --- .idea/.name | 1 - .idea/compiler.xml | 22 ------ .idea/copyright/profiles_settings.xml | 3 - .idea/encodings.xml | 6 -- .idea/gradle.xml | 27 -------- .idea/misc.xml | 46 ------------- .idea/modules.xml | 10 --- .idea/runConfigurations.xml | 12 ---- .idea/vcs.xml | 6 -- app/app.iml | 96 --------------------------- 10 files changed, 229 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/runConfigurations.xml delete mode 100644 .idea/vcs.xml delete mode 100644 app/app.iml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index aad65a6..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -AdjustableImageView \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 4ba15e8..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 5d19981..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 6aa242a..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/app.iml b/app/app.iml deleted file mode 100644 index 4df588c..0000000 --- a/app/app.iml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From e430b8c8102a64ef1ec1694fffeb92641e667799 Mon Sep 17 00:00:00 2001 From: Akexorcist Date: Sun, 15 Oct 2017 20:18:13 +0700 Subject: [PATCH 4/5] Remove iml --- adjustable-imageview/adjustable-imageview.iml | 97 ------------------- 1 file changed, 97 deletions(-) delete mode 100644 adjustable-imageview/adjustable-imageview.iml diff --git a/adjustable-imageview/adjustable-imageview.iml b/adjustable-imageview/adjustable-imageview.iml deleted file mode 100644 index dfe3704..0000000 --- a/adjustable-imageview/adjustable-imageview.iml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From ccc57fa520f24864f778310ec7166ed484f5e0fa Mon Sep 17 00:00:00 2001 From: Akexorcist Date: Sun, 15 Oct 2017 20:18:42 +0700 Subject: [PATCH 5/5] Use AppCompatActivity instead of ActionBarActivity --- .../example/adjustableimageview/MainActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/inthecheesefactory/example/adjustableimageview/MainActivity.java b/app/src/main/java/com/inthecheesefactory/example/adjustableimageview/MainActivity.java index 08f3693..556c411 100644 --- a/app/src/main/java/com/inthecheesefactory/example/adjustableimageview/MainActivity.java +++ b/app/src/main/java/com/inthecheesefactory/example/adjustableimageview/MainActivity.java @@ -1,12 +1,12 @@ package com.inthecheesefactory.example.adjustableimageview; -import android.support.v7.app.ActionBarActivity; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; -public class MainActivity extends ActionBarActivity { +public class MainActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) {