Skip to content

Commit 1bfa806

Browse files
giolaqgiolaq
authored
Merge pull request #82 from amzn/refresh
Refresh
2 parents 42a656d + 102a8b9 commit 1bfa806

File tree

24 files changed

+349
-262
lines changed

24 files changed

+349
-262
lines changed

‎AMZNMediaPlayerComponent/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ jacoco {
4747
}
4848

4949
dependencies {
50-
compile fileTree(dir: 'libs', include: ['*.jar'])
51-
compile 'com.android.support:appcompat-v7:23.1.1'
52-
compile files('libs/AMZNMediaPlayer.jar')
53-
compile project(':ModuleInterface')
54-
compile project(':UAMP')
50+
implementation fileTree(dir: 'libs', include: ['*.jar'])
51+
implementation 'com.android.support:appcompat-v7:23.1.1'
52+
implementation files('libs/AMZNMediaPlayer.jar')
53+
implementation project(':ModuleInterface')
54+
implementation project(':UAMP')
5555

5656
// Set this dependency to use JUnit 4 rules
57-
androidTestCompile 'com.android.support.test:rules:0.4.1'
57+
androidTestImplementation 'com.android.support.test:rules:0.4.1'
5858

59-
androidTestCompile('com.android.support.test:runner:0.4.1') {
59+
androidTestImplementation('com.android.support.test:runner:0.4.1') {
6060
exclude module: 'support-annotations'
6161
}
6262
}

‎AdsInterface/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ jacoco {
4242
}
4343

4444
dependencies {
45-
compile fileTree(dir: 'libs', include: ['*.jar'])
45+
implementation fileTree(dir: 'libs', include: ['*.jar'])
4646

4747
// Set this dependency to use JUnit 4 rules
48-
androidTestCompile 'com.android.support.test:rules:0.4.1'
48+
androidTestImplementation 'com.android.support.test:rules:0.4.1'
4949

50-
androidTestCompile('com.android.support.test:runner:0.4.1') {
50+
androidTestImplementation('com.android.support.test:runner:0.4.1') {
5151
exclude module: 'support-annotations'
5252
}
5353
}

‎AnalyticsInterface/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ jacoco {
4444
}
4545

4646
dependencies {
47-
compile fileTree(include: ['*.jar'], dir: 'libs')
48-
testCompile 'junit:junit:4.12'
49-
compile 'com.android.support:appcompat-v7:23.1.1'
47+
implementation fileTree(include: ['*.jar'], dir: 'libs')
48+
testImplementation 'junit:junit:4.12'
49+
implementation 'com.android.support:appcompat-v7:23.1.1'
5050
// Set this dependency to use JUnit 4 rules
51-
androidTestCompile 'com.android.support.test:rules:0.4.1'
52-
androidTestCompile('com.android.support.test:runner:0.4.1') {
51+
androidTestImplementation 'com.android.support.test:rules:0.4.1'
52+
androidTestImplementation('com.android.support.test:runner:0.4.1') {
5353
exclude module: 'support-annotations'
5454
}
55-
compile project(':Utils')
55+
implementation project(':Utils')
5656
}

‎Application/apks/debug/output-metadata.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"version": 3,
3+
"artifactType": {
4+
"type": "APK",
5+
"kind": "Directory"
6+
},
7+
"applicationId": "com.fireappbuilder.android.calypso",
8+
"variantName": "debug",
9+
"elements": [
10+
{
11+
"type": "SINGLE",
12+
"filters": [],
13+
"attributes": [],
14+
"versionCode": 10,
15+
"versionName": "1.0.7",
16+
"outputFile": "FireAppBuilder_1.0.7.apk"
17+
}
18+
],
19+
"elementType": "File"
20+
}

‎Application/app/build.gradle‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -81,24 +81,25 @@ android {
8181
}
8282

8383
dependencies {
84-
compile fileTree(include: ['*.jar'], dir: 'libs')
85-
androidTestCompile 'junit:junit:4.12'
86-
androidTestCompile 'org.mockito:mockito-core:1.9.5'
87-
androidTestCompile ('com.android.support.test:rules:0.5') {
84+
implementation fileTree(include: ['*.jar'], dir: 'libs')
85+
androidTestImplementation 'junit:junit:4.12'
86+
androidTestImplementation 'org.mockito:mockito-core:1.9.5'
87+
androidTestImplementation ('com.android.support.test:rules:0.5') {
8888
exclude group: 'com.android.support', module: 'support-annotations'
8989
}
90-
androidTestCompile ('com.android.support.test:runner:0.5') {
90+
androidTestImplementation ('com.android.support.test:runner:0.5') {
9191
exclude group: 'com.android.support', module: 'support-annotations'
9292
}
93-
androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
94-
androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
93+
androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
94+
androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
9595

96-
androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.3.1'
96+
androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.3.1'
9797

98-
compile project(':TVUIComponent')
99-
compile project(':UAMP')
100-
compile project(':AMZNMediaPlayerComponent')
101-
compile project(':PassThroughAdsComponent')
102-
compile project(':PassThroughLoginComponent')
103-
compile project(':LoggerAnalyticsComponent')
98+
implementation project(':TVUIComponent')
99+
implementation project(':UAMP')
100+
implementation project(':AMZNMediaPlayerComponent')
101+
implementation project(':PassThroughAdsComponent')
102+
implementation project(':PassThroughLoginComponent')
103+
implementation project(':LoggerAnalyticsComponent')
104+
androidTestImplementation project(path: ':ContentBrowser')
104105
}

‎Application/artifacts.gradle‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
//android.applicationVariants.all { variant ->
2+
// variant.outputs.each { output ->
3+
// // Redirect your apks to new defined location to outputDirPath
4+
// def outputDirPath = new File("${project.rootDir.absolutePath}/apks/${variant.flavorName}/${variant.buildType.name}")
5+
// variant.packageApplicationProvider.get().outputDirectory = outputDirPath
6+
//
7+
// def apkFileName = "${rootProject.name}_${android.defaultConfig.versionName}.apk"
8+
// output.outputFileName = apkFileName // directly assign the new name back to outputFileName
9+
// }
10+
//}
11+
//
112
android.applicationVariants.all { variant ->
213
;
314
def appName
@@ -9,17 +20,8 @@ android.applicationVariants.all { variant ->
920
}
1021

1122
variant.outputs.each { output ->
12-
;
13-
def newApkName
14-
if (output.zipAlign) {
15-
newApkName = "${appName}-${output.baseName}-${variant.versionName}.apk"
16-
} else {
17-
newApkName = "${appName}-${output.baseName}-${variant.versionName}-unaligned.apk"
18-
}
19-
//fix from https://stackoverflow.com/questions/49530142/android-studio-3-1-buildgradle3-1-0-absolute-path-are-not-supported-when-se
20-
def relativeRootDir = output.packageApplication.outputDirectory.toPath()
21-
.relativize(rootDir.toPath()).toFile()
22-
output.outputFileName = new File( "$relativeRootDir/build", newApkName)
23+
def apkFileName = "${appName}_${android.defaultConfig.versionName}.apk"
24+
output.outputFileName = apkFileName // directly assign the new name back to outputFileName
2325

2426
//-- original causes error
2527
//output.outputFileName = new File(output.outputFile.parent, newApkName)

‎Application/build.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ buildscript {
2121
jcenter()
2222
}
2323
dependencies {
24-
classpath 'com.android.tools.build:gradle:3.2.0'
25-
24+
classpath 'com.android.tools.build:gradle:7.0.4'
2625
// NOTE: Do not place your application dependencies here; they belong
2726
// in the individual module build.gradle files
2827
}

‎Application/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎AuthInterface/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ jacoco {
4242
}
4343

4444
dependencies {
45-
compile fileTree(dir: 'libs', include: ['*.jar'])
45+
implementation fileTree(dir: 'libs', include: ['*.jar'])
4646
// Set this dependency to use JUnit 4 rules
47-
androidTestCompile 'com.android.support.test:rules:0.4.1'
48-
androidTestCompile('junit:junit:4.12')
47+
androidTestImplementation 'com.android.support.test:rules:0.4.1'
48+
androidTestImplementation('junit:junit:4.12')
4949

50-
androidTestCompile('com.android.support.test:runner:0.4.1') {
50+
androidTestImplementation('com.android.support.test:runner:0.4.1') {
5151
exclude module: 'support-annotations'
5252
}
5353
}

‎ContentBrowser/build.gradle‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -44,35 +44,36 @@ android {
4444
}
4545

4646
dependencies {
47-
compile fileTree(dir: 'libs', include: ['*.jar'])
48-
compile 'com.android.support:appcompat-v7:23.1.1'
49-
compile 'com.android.support:support-v4:23.1.1'
50-
compile 'com.android.support:recommendation:23.1.1'
47+
implementation fileTree(dir: 'libs', include: ['*.jar'])
48+
implementation 'com.android.support:appcompat-v7:23.1.1'
49+
implementation 'com.android.support:support-v4:23.1.1'
50+
implementation 'com.android.support:recommendation:23.1.1'
51+
implementation 'org.greenrobot:eventbus:3.0.0'
5152

52-
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta2'
53-
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'
54-
testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'
53+
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.4-beta2'
54+
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'
55+
testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'
5556

56-
androidTestCompile('com.android.support.test:runner:0.4') {
57+
androidTestImplementation('com.android.support.test:runner:0.4') {
5758
exclude group: 'com.android.support', module: 'support-annotations'
5859
}
59-
androidTestCompile('com.android.support.test:rules:0.4') {
60+
androidTestImplementation('com.android.support.test:rules:0.4') {
6061
exclude group: 'com.android.support', module: 'support-annotations'
6162
}
62-
androidTestCompile 'junit:junit:4.12'
63+
androidTestImplementation 'junit:junit:4.12'
6364

64-
compile project(':ModuleInterface')
65-
compile project(':AuthInterface')
66-
compile project(':AnalyticsInterface')
67-
compile project(':AdsInterface')
68-
compile project(':PurchaseInterface')
69-
compile project(':UAMP')
70-
compile project(':DataLoader')
71-
compile project(':DynamicParser')
72-
compile project(':Utils')
73-
compile project(':ContentModel')
65+
api project(':ModuleInterface')
66+
api project(':AuthInterface')
67+
api project(':AnalyticsInterface')
68+
api project(':AdsInterface')
69+
api project(':PurchaseInterface')
70+
api project(':UAMP')
71+
api project(':DataLoader')
72+
api project(':DynamicParser')
73+
api project(':Utils')
74+
api project(':ContentModel')
7475
// Global font support
75-
compile project(':Calligraphy')
76+
implementation project(':Calligraphy')
7677
}
7778

7879
buildscript {

0 commit comments

Comments
 (0)