Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Git Diff for latest Android Studio 4.1.1 #17

Open
tincupchalice opened this issue Nov 14, 2020 · 0 comments
Open

Git Diff for latest Android Studio 4.1.1 #17

tincupchalice opened this issue Nov 14, 2020 · 0 comments

Comments

@tincupchalice
Copy link

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant