Skip to content

Commit

Permalink
Starting to create/add a new visualizer and upgrading to Android Stud…
Browse files Browse the repository at this point in the history
…io 3.1
  • Loading branch information
carlosrafaelgn committed Oct 2, 2018
1 parent 582d6ba commit 022f3e3
Show file tree
Hide file tree
Showing 13 changed files with 231 additions and 44 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ build/
obj/
gen/
proguard/
traditional/
x/
ic_launcher-web.png
local.properties
# Intellij project files
Expand Down
29 changes: 16 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ apply plugin: 'com.android.application'

buildscript {
repositories {
mavenCentral()
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'com.android.tools.build:gradle:3.1.4'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -14,16 +15,17 @@ buildscript {

allprojects {
repositories {
mavenCentral()
jcenter()
google()
flatDir {
dirs 'libs'
}
}
}

android {
compileSdkVersion 26
buildToolsVersion "20.0.0"
compileSdkVersion 28
buildToolsVersion "28.0.2"

// versionCode must be kept in sync with UI.VERSION_CODE
// versionName must be kept in sync with UI.VERSION_NAME
Expand Down Expand Up @@ -53,18 +55,22 @@ android {
}
}

flavorDimensions "mode"

productFlavors {
traditional {
dimension "mode"
applicationId "br.com.carlosrafaelgn.fplay"
minSdkVersion 10
targetSdkVersion 26
targetSdkVersion 28
buildConfigField 'boolean', 'X', 'false'
}

x {
dimension "mode"
applicationId "br.com.carlosrafaelgn.fplay.x"
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 28
buildConfigField 'boolean', 'X', 'true'
}
}
Expand Down Expand Up @@ -94,9 +100,6 @@ android {
jniLibs.srcDirs = ['libs', 'libs-x']
}

// Move the tests to tests/java, tests/res, etc...
instrumentTest.setRoot('tests')

// Move the build types to build-types/<type>
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
// This moves them out of them default location under src/<type>/... which would
Expand All @@ -116,7 +119,7 @@ android {
}

dependencies {
compile fileTree(include: '*.jar', dir: 'libs')
compile 'com.google.code.gson:gson:2.8.2'
compile project(':fplay.plugin')
implementation fileTree(include: '*.jar', dir: 'libs')
implementation 'com.google.code.gson:gson:2.8.2'
implementation project(':fplay.plugin')
}
10 changes: 5 additions & 5 deletions fplay.plugin.httptransmitter/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 26
buildToolsVersion "20.0.0"
compileSdkVersion 28
buildToolsVersion "28.0.2"

defaultConfig {
applicationId "br.com.carlosrafaelgn.fplay.plugin.httptransmitter"
minSdkVersion 10
targetSdkVersion 26
targetSdkVersion 28
}
buildTypes {
release {
Expand All @@ -18,6 +18,6 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
provided project(':fplay.plugin')
implementation fileTree(include: ['*.jar'], dir: 'libs')
compileOnly project(':fplay.plugin')
}
12 changes: 6 additions & 6 deletions fplay.plugin.wirelessvisualizer/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 26
buildToolsVersion "20.0.0"
compileSdkVersion 28
buildToolsVersion "28.0.2"

defaultConfig {
applicationId "br.com.carlosrafaelgn.fplay.plugin.wirelessvisualizer"
minSdkVersion 10
targetSdkVersion 26
targetSdkVersion 28
}
buildTypes {
release {
Expand All @@ -18,7 +18,7 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
provided project(':fplay.plugin')
compile(name: 'IoTDCP', ext: 'aar')
implementation fileTree(include: ['*.jar'], dir: 'libs')
compileOnly project(':fplay.plugin')
implementation(name: 'IoTDCP', ext: 'aar')
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
Loading

0 comments on commit 022f3e3

Please sign in to comment.