java-tech
diff --git a/‎com.vogella.android.gradlebuildflavors/app/build.gradle
Lines changed: 8 additions & 7 deletions b/‎com.vogella.android.gradlebuildflavors/app/build.gradle
Lines changed: 8 additions & 7 deletions
diff --git a/‎com.vogella.android.gradlebuildflavors/app/src/free/res/values/strings.xml
Lines changed: 0 additions & 6 deletions b/‎com.vogella.android.gradlebuildflavors/app/src/free/res/values/strings.xml
Lines changed: 0 additions & 6 deletions
diff --git a/‎com.vogella.android.gradlebuildflavors/app/src/free/java/com/vogella/android/gradlebuildflavors/ReturnIt.java renamed to ‎com.vogella.android.gradlebuildflavors/app/src/mock/java/com/vogella/android/gradlebuildflavors/ReturnIt.java b/‎com.vogella.android.gradlebuildflavors/app/src/free/java/com/vogella/android/gradlebuildflavors/ReturnIt.java renamed to ‎com.vogella.android.gradlebuildflavors/app/src/mock/java/com/vogella/android/gradlebuildflavors/ReturnIt.java
diff --git a/‎com.vogella.android.gradlebuildflavors/app/src/mock/res/values/strings.xml
Lines changed: 4 additions & 0 deletions b/‎com.vogella.android.gradlebuildflavors/app/src/mock/res/values/strings.xml
Lines changed: 4 additions & 0 deletions
diff --git a/‎com.vogella.android.gradlebuildflavors/app/src/paid/java/com/vogella/android/gradlebuildflavors/ReturnIt.java renamed to ‎com.vogella.android.gradlebuildflavors/app/src/prod/java/com/vogella/android/gradlebuildflavors/ReturnIt.java b/‎com.vogella.android.gradlebuildflavors/app/src/paid/java/com/vogella/android/gradlebuildflavors/ReturnIt.java renamed to ‎com.vogella.android.gradlebuildflavors/app/src/prod/java/com/vogella/android/gradlebuildflavors/ReturnIt.java
diff --git a/‎com.vogella.android.gradlebuildflavors/app/src/prod/res/values/strings.xml
Lines changed: 4 additions & 0 deletions b/‎com.vogella.android.gradlebuildflavors/app/src/prod/res/values/strings.xml
Lines changed: 4 additions & 0 deletions
diff --git a/‎com.vogella.android.gradlebuildflavors/build.gradle
Lines changed: 1 addition & 1 deletion b/‎com.vogella.android.gradlebuildflavors/build.gradle
Lines changed: 1 addition & 1 deletion
diff --git a/‎com.vogella.android.gradlebuildflavors/gradle/wrapper/gradle-wrapper.properties
Lines changed: 2 additions & 2 deletions b/‎com.vogella.android.gradlebuildflavors/gradle/wrapper/gradle-wrapper.properties
Lines changed: 2 additions & 2 deletions
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "23.0.0"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.3"
 
     lintOptions {
         abortOnError false
@@ -22,14 +22,15 @@ android {
         }
     }
     productFlavors {
-        paid {
-            applicationId = "com.vogella.android.paid"
+        prod {
+            applicationId = "com.vogella.android.gradlebuildflavors.prod"
+            versionName = "1.0-paid"
         }
 
-        free {
-            applicationId = "com.vogella.android.free"
+        mock {
+            applicationId = "com.vogella.android.gradlebuildflavors.mock"
+            versionName = "1.0-free"
         }
-
     }
 
 }
 
@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name">Flavor</string>
+    <string name="hello_world">Mock World! </string>
+</resources>
@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name">Flavor</string>
+    <string name="hello_world">Prod World! </string>
+</resources>
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:2.2.0-alpha3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
 
@@ -1,6 +1,6 @@
-#Mon Jul 20 08:46:03 CEST 2015
+#Sat Jun 18 13:35:24 CEST 2016
 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-2.10-all.zip
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`apply plugin: 'com.android.application'`
`2`	`2`
`3`	`3`	`android {`
`4`		`- compileSdkVersion 22`
`5`		`- buildToolsVersion "23.0.0"`
	`4`	`+ compileSdkVersion 23`
	`5`	`+ buildToolsVersion "23.0.3"`
`6`	`6`
`7`	`7`	`lintOptions {`
`8`	`8`	`abortOnError false`
`@@ -22,14 +22,15 @@ android {`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`productFlavors {`
`25`		`- paid {`
`26`		`- applicationId = "com.vogella.android.paid"`
	`25`	`+ prod {`
	`26`	`+ applicationId = "com.vogella.android.gradlebuildflavors.prod"`
	`27`	`+ versionName = "1.0-paid"`
`27`	`28`	`}`
`28`	`29`
`29`		`- free {`
`30`		`- applicationId = "com.vogella.android.free"`
	`30`	`+ mock {`
	`31`	`+ applicationId = "com.vogella.android.gradlebuildflavors.mock"`
	`32`	`+ versionName = "1.0-free"`
`31`	`33`	`}`
`32`		`-`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:1.3.0'`
	`8`	`+ classpath 'com.android.tools.build:gradle:2.2.0-alpha3'`
`9`	`9`
`10`	`10`	`// NOTE: Do not place your application dependencies here; they belong`
`11`	`11`	`// in the individual module build.gradle files`