Permalink
Browse files

Update Gradle config and .gitignore for Android Studio 1.0 / Gradle 2.2

  • Loading branch information...
1 parent ace0ad4 commit 2a575285b73bf2aa9fe467f5650db67bd6debf9a @protyposis committed Jan 22, 2015
View
@@ -1,6 +1,7 @@
.gradle
/local.properties
/.idea/workspace.xml
+/.idea/libraries
.DS_Store
build/
View
@@ -3,8 +3,9 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
- <option name="distributionType" value="DEFAULT_WRAPPED" />
+ <option name="distributionType" value="LOCAL" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
+ <option name="gradleHome" value="C:\Users\Mario\AppData\Local\Android\android-studio\gradle\gradle-2.2.1" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="answers-1.0.1">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/MediaPlayerDemo/build/intermediates/exploded-aar/com.crashlytics.sdk.android/answers/1.0.1/classes.jar!/" />
- <root url="file://$PROJECT_DIR$/MediaPlayerDemo/build/intermediates/exploded-aar/com.crashlytics.sdk.android/answers/1.0.1/res" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="aspectjrt-1.8.2">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.aspectj/aspectjrt/1.8.2/7dede91c0c36b1265fc99c55283b90ed2be144c8/aspectjrt-1.8.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.aspectj/aspectjrt/1.8.2/a77b22e3a955cfd274639e2bfbcbcf32d562f6e/aspectjrt-1.8.2-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="beta-1.0.1">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/MediaPlayerDemo/build/intermediates/exploded-aar/com.crashlytics.sdk.android/beta/1.0.1/classes.jar!/" />
- <root url="file://$PROJECT_DIR$/MediaPlayerDemo/build/intermediates/exploded-aar/com.crashlytics.sdk.android/beta/1.0.1/res" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="crashlytics-2.0.1">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/MediaPlayerDemo/build/intermediates/exploded-aar/com.crashlytics.sdk.android/crashlytics/2.0.1/classes.jar!/" />
- <root url="file://$PROJECT_DIR$/MediaPlayerDemo/build/intermediates/exploded-aar/com.crashlytics.sdk.android/crashlytics/2.0.1/res" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="fabric-1.0.1">
- <CLASSES>
- <root url="file://$PROJECT_DIR$/MediaPlayerDemo/build/intermediates/exploded-aar/io.fabric.sdk.android/fabric/1.0.1/res" />
- <root url="jar://$PROJECT_DIR$/MediaPlayerDemo/build/intermediates/exploded-aar/io.fabric.sdk.android/fabric/1.0.1/classes.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="isoparser-1.0.3.11-DASHFIX">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/googlecode/mp4parser/isoparser/1.0.3.11-DASHFIX/isoparser-1.0.3.11-DASHFIX.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/googlecode/mp4parser/isoparser/1.0.3.11-DASHFIX/isoparser-1.0.3.11-DASHFIX-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="okhttp-2.0.0">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp/okhttp/2.0.0/4c8d1536dba3812cc1592090dc20c47a4ed3c35e/okhttp-2.0.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp/okhttp/2.0.0/af42b755327c58cfae866f18ed873e2d537e0ea8/okhttp-2.0.0-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="okio-1.0.1">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.0.1/39eff75ddcb987ff65888361a29f489c178429a3/okio-1.0.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.0.1/2ae4aaa959f14ce2a34961260a4cee93960566ff/okio-1.0.1-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
View
@@ -3,7 +3,7 @@
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
</project>
@@ -80,6 +80,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/publications" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
@@ -6,15 +6,14 @@ android {
buildToolsVersion "19.1.0"
defaultConfig {
- applicationId playerModuleBase + ".dash"
minSdkVersion 16
targetSdkVersion 19
versionCode libraryVersionCode
versionName libraryVersionName
}
buildTypes {
release {
- runProguard false
+ minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
@@ -37,7 +36,7 @@ publishing {
artifactId = "mediaplayer-dash"
version = android.defaultConfig.versionName + "-SNAPSHOT"
- artifact file('build/outputs/aar/MediaPlayer-DASH.aar')
+ artifact file('build/outputs/aar/MediaPlayer-DASH-debug.aar')
/* The maven-publish plugin fails to automatically pick up (Android) dependencies,
* so they need to be added manually:
@@ -61,8 +60,10 @@ publishing {
}
}
}
-afterEvaluate {
- publishDebugSnapshotPublicationToMavenLocal.dependsOn assembleDebug
+model {
+ tasks.publishDebugSnapshotPublicationToMavenLocal {
+ dependsOn assembleDebug
+ }
}
//apply from: "../gitversioning.gradle"
@@ -80,6 +80,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/publications" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
@@ -6,15 +6,14 @@ android {
buildToolsVersion "19.1.0"
defaultConfig {
- applicationId playerModuleBase + ".gles.flowabs"
minSdkVersion 16
targetSdkVersion 19
versionCode libraryVersionCode
versionName libraryVersionName
}
buildTypes {
release {
- runProguard false
+ minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
@@ -34,12 +33,14 @@ publishing {
artifactId = "mediaplayer-gles-flowabs"
version = android.defaultConfig.versionName + "-SNAPSHOT"
- artifact file('build/outputs/aar/MediaPlayer-GLES-FlowAbs.aar')
+ artifact file('build/outputs/aar/MediaPlayer-GLES-FlowAbs-debug.aar')
}
}
}
-afterEvaluate {
- publishDebugSnapshotPublicationToMavenLocal.dependsOn assembleDebug
+model {
+ tasks.publishDebugSnapshotPublicationToMavenLocal {
+ dependsOn assembleDebug
+ }
}
//apply from: "../gitversioning.gradle"
@@ -80,6 +80,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/publications" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
@@ -6,15 +6,14 @@ android {
buildToolsVersion "19.1.0"
defaultConfig {
- applicationId playerModuleBase + ".gles.qrmarker"
minSdkVersion 16
targetSdkVersion 19
versionCode libraryVersionCode
versionName libraryVersionName
}
buildTypes {
release {
- runProguard false
+ minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
@@ -34,12 +33,14 @@ publishing {
artifactId = "mediaplayer-gles-qrmarker"
version = android.defaultConfig.versionName + "-SNAPSHOT"
- artifact file('build/outputs/aar/MediaPlayer-GLES-QrMarker.aar')
+ artifact file('build/outputs/aar/MediaPlayer-GLES-QrMarker-debug.aar')
}
}
}
-afterEvaluate {
- publishDebugSnapshotPublicationToMavenLocal.dependsOn assembleDebug
+model {
+ tasks.publishDebugSnapshotPublicationToMavenLocal {
+ dependsOn assembleDebug
+ }
}
//apply from: "../gitversioning.gradle"
@@ -86,6 +86,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/publications" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
@@ -6,15 +6,14 @@ android {
buildToolsVersion "19.1.0"
defaultConfig {
- applicationId playerModuleBase + ".gles"
minSdkVersion 16
targetSdkVersion 19
versionCode libraryVersionCode
versionName libraryVersionName
}
buildTypes {
release {
- runProguard false
+ minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
@@ -34,12 +33,14 @@ publishing {
artifactId = "mediaplayer-gles"
version = android.defaultConfig.versionName + "-SNAPSHOT"
- artifact file('build/outputs/aar/MediaPlayer-GLES.aar')
+ artifact file('build/outputs/aar/MediaPlayer-GLES-debug.aar')
}
}
}
-afterEvaluate {
- publishDebugSnapshotPublicationToMavenLocal.dependsOn assembleDebug
+model {
+ tasks.publishDebugSnapshotPublicationToMavenLocal {
+ dependsOn assembleDebug
+ }
}
//apply from: "../gitversioning.gradle"
@@ -80,6 +80,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/publications" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
@@ -6,15 +6,14 @@ android {
buildToolsVersion "19.1.0"
defaultConfig {
- applicationId playerModuleBase
minSdkVersion 16
targetSdkVersion 19
versionCode libraryVersionCode
versionName libraryVersionName
}
buildTypes {
release {
- runProguard false
+ minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
@@ -33,12 +32,14 @@ publishing {
artifactId = "mediaplayer"
version = android.defaultConfig.versionName + "-SNAPSHOT"
- artifact file('build/outputs/aar/MediaPlayer.aar')
+ artifact file('build/outputs/aar/MediaPlayer-debug.aar')
}
}
}
-afterEvaluate {
- publishDebugSnapshotPublicationToMavenLocal.dependsOn assembleDebug
+model {
+ tasks.publishDebugSnapshotPublicationToMavenLocal {
+ dependsOn assembleDebug
+ }
}
//apply from: "../gitversioning.gradle"
@@ -38,17 +38,19 @@ android {
versionNameSuffix "-debug"
}
release {
- runProguard false
+ minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.release
}
}
applicationVariants.all { variant ->
- if(variant.name == android.buildTypes.release.name) {
- def file = variant.outputFile
- def fileName = file.name.replace(".apk", "-" + defaultConfig.versionCode + "-" + defaultConfig.versionName + ".apk")
- variant.outputFile = new File(file.parent, fileName)
+ variant.outputs.each { output ->
+ if (variant.name == android.buildTypes.release.name) {
+ def file = output.outputFile
+ def fileName = file.name.replace(".apk", "-" + defaultConfig.versionCode + "-" + defaultConfig.versionName + ".apk")
+ output.outputFile = new File(file.parent, fileName)
+ }
}
}
}
View
@@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.14.2'
+ classpath 'com.android.tools.build:gradle:1.0.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -56,8 +56,10 @@ android {
* dynamically at execution time and cannot be accessed at configuration time. */
(project.isLibrary ? libraryVariants : applicationVariants).all { variant ->
//if(variant.name.equalsIgnoreCase('release')) {
- variant.processManifest.doFirst {
- checkForGit()
+ variant.outputs.each { output ->
+ output.processManifest.doFirst {
+ checkForGit()
+ }
}
//}
}
Oops, something went wrong.

0 comments on commit 2a57528

Please sign in to comment.