Merge pull request jakob-grabner#98 from jakob-grabner/feature/update…

…_target_sdk Update gradle files
cavb · Nov 17, 2018 · 63f7b93 · 63f7b93
2 parents 3c42cdb + 5ee3efe
commit 63f7b93
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 57 deletions.
diff --git a/CircleProgressView/build.gradle b/CircleProgressView/build.gradle
@@ -3,57 +3,52 @@ apply plugin: 'com.github.dcendents.android-maven'
 
 group = 'com.github.jakob-grabner'
 android {
-    compileSdkVersion 25
-    buildToolsVersion '24.0.2'
-    defaultConfig {
-        minSdkVersion 11
-        targetSdkVersion 25
-        versionCode 3
-        versionName "1.2"
-    }
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        debug {
-            minifyEnabled false
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_6
-        targetCompatibility JavaVersion.VERSION_1_6
-    }
-    productFlavors {
-    }
-
-
+	compileSdkVersion 28
+	defaultConfig {
+		minSdkVersion 19
+		targetSdkVersion 28
+		versionCode 4
+		versionName "1.3"
+	}
+	buildTypes {
+		release {
+			minifyEnabled false
+			proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+		}
+	}
+
+	compileOptions {
+		sourceCompatibility JavaVersion.VERSION_1_6
+		targetCompatibility JavaVersion.VERSION_1_6
+	}
+	productFlavors {
+	}
 }
 
 dependencies {
-    compile 'com.android.support:support-annotations:25.1.0'
+	api 'com.android.support:support-annotations:28.0.0'
 }
 
 // build a jar with source files
 task sourcesJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
+	from android.sourceSets.main.java.srcDirs
+	classifier = 'sources'
 }
 
 task javadoc(type: Javadoc) {
-    failOnError false
-    source = android.sourceSets.main.java.sourceFiles
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    classpath += configurations.compile
+	failOnError false
+	source = android.sourceSets.main.java.sourceFiles
+	classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+	classpath += configurations.compile
 }
 
 // build a jar with javadoc
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
+	classifier = 'javadoc'
+	from javadoc.destinationDir
 }
 
 artifacts {
-    archives sourcesJar
-    archives javadocJar
-}
+	archives sourcesJar
+	archives javadocJar
+}
diff --git a/ExampleApp/build.gradle b/ExampleApp/build.gradle
@@ -1,18 +1,16 @@
 apply plugin: 'com.android.application'
 
 android {
-
-    compileSdkVersion 25
-    buildToolsVersion '24.0.2'
+    compileSdkVersion 28
     repositories {
         maven { url "https://jitpack.io" }
     }
     defaultConfig {
         applicationId "at.grabner.example.circleprogressview"
-        minSdkVersion 14
-        targetSdkVersion 25
-        versionCode 2
-        versionName "1.1"
+        minSdkVersion 21
+        targetSdkVersion 28
+        versionCode 3
+        versionName "1.2"
     }
     buildTypes {
         release {
@@ -23,18 +21,12 @@ android {
             minifyEnabled false
         }
     }
-    productFlavors {
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_6
-        targetCompatibility JavaVersion.VERSION_1_6
-    }
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile project(':CircleProgressView')
-    //    compile 'com.github.jakob-grabner:Circle-Progress-View:v1+'
-    compile 'com.android.support:appcompat-v7:25.1.0'
-    compile 'com.android.support:design:25.1.0'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation project(':CircleProgressView')
+    //    implementation 'com.github.jakob-grabner:Circle-Progress-View:v1+'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
 }
diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // For Jitpack.io
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -16,6 +17,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
         maven { url "https://jitpack.io" }
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip