Skip to content

Git Diff for latest Android Studio 4.1.1 #17

@tincupchalice

Description

@tincupchalice

git diff
diff --git a/SampleAndroidOAuth2/app/build.gradle b/SampleAndroidOAuth2/app/build.gradle
index 34c11d7..1848cbc 100644
--- a/SampleAndroidOAuth2/app/build.gradle
+++ b/SampleAndroidOAuth2/app/build.gradle
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {

  • compileSdkVersion 25
  • buildToolsVersion "24.0.3"
  • compileSdkVersion 28 //25

  • // buildToolsVersion "24.0.3"

    defaultConfig {
    applicationId "com.fitbit.sampleandroidoauth2"

  •    minSdkVersion 16
    
  •    targetSdkVersion 25
    
  •    minSdkVersion 18
    
  •    targetSdkVersion 28
       versionCode 1
       versionName "1.0"
    
    }
    @@ -22,6 +22,7 @@ android {
    }
    }

+/*
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':fitbitapi')
@@ -33,3 +34,16 @@ dependencies {

 testCompile 'junit:junit:4.+'

}
+*/
+
+dependencies {

  • compileOnly fileTree(dir: 'libs', include: ['*.jar'])
  • compileOnly project(':fitbitapi')
  • compileOnly project(':fitbitauth')
  • implementation 'com.android.support:appcompat-v7:25.+'
  • implementation 'com.android.support:design:25.+'
  • implementation 'com.android.support:support-v13:25.+'
  • implementation 'com.jjoe64:graphview:4.+'
  • // testCompile 'junit:junit:4.+'
    +}
    \ No newline at end of file
    diff --git a/SampleAndroidOAuth2/build.gradle b/SampleAndroidOAuth2/build.gradle
    index 74b2ab0..3819a61 100644
    --- a/SampleAndroidOAuth2/build.gradle
    +++ b/SampleAndroidOAuth2/build.gradle
    @@ -1,5 +1,5 @@
    // Top-level build file where you can add configuration options common to all sub-projects/modules.

+/*
buildscript {
repositories {
jcenter()
@@ -21,3 +21,23 @@ allprojects {
task clean(type: Delete) {
delete rootProject.buildDir
}
+*/
+buildscript {

  • repositories {
  •    jcenter()
    
  •    google()
    
  • }
  • dependencies {
  •    classpath 'com.android.tools.build:gradle:3.4.0'
    
  • }
    +}

+allprojects {

  • repositories {
  •    google()
    
  •    jcenter()
    
  •    maven {
    
  •        url "https://jitpack.io"
    
  •    }
    
  • }
    +}

I also updated the gradle.properties files to
distributionUrl=https://services.gradle.org/distributions/gradle-5.1.1-all.zip

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions