Skip to content

Commit

Permalink
Release 3.7.5
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-crowe committed Jul 20, 2021
1 parent 73eee20 commit 524eeba
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 89 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId "com.unity3d.ads.example"
minSdkVersion 19
targetSdkVersion 30
versionCode = 3740
versionName = "3.7.4"
versionCode = 3750
versionName = "3.7.5"
}

flavorDimensions "arEnabled"
Expand Down
21 changes: 21 additions & 0 deletions fatAar.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
task deleteOldJar(type: Delete) {
delete("../unity-ads/libs/${project.name}.jar")
}

def copyJarTask(buildType) {
return tasks.create("copyJars${buildType}", Copy.class) {
from("build/intermediates/compile_library_classes_jar/${buildType}/")
into('../unity-ads/libs/')
include('classes.jar')
rename('classes.jar', "${project.name}.jar")
}.dependsOn(deleteOldJar)
}

project.tasks.whenTaskAdded { Task theTask ->
if (theTask.name == 'bundleLibCompileToJarRelease') {
theTask.finalizedBy(copyJarTask("release"))
}
if (theTask.name == 'bundleLibCompileToJarDebug') {
theTask.finalizedBy(copyJarTask("debug"))
}
}
19 changes: 19 additions & 0 deletions nexusPublishing.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
apply plugin: 'io.github.gradle-nexus.publish-plugin'

Properties properties = new Properties()
if (project.rootProject.file('local.properties').exists()) {
properties.load(project.rootProject.file('local.properties').newDataInputStream())
}

nexusPublishing {
repositories {
sonatype {
stagingProfileId = properties.getProperty("NEXUS_PROFILE_ID")
username = properties.getProperty("NEXUS_USERNAME")
password = properties.getProperty("NEXUS_PASSWORD")
// Add these lines if using new Sonatype infra
nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
}
}
}
4 changes: 0 additions & 4 deletions scripts/build.sh

This file was deleted.

4 changes: 0 additions & 4 deletions scripts/test.sh

This file was deleted.

12 changes: 6 additions & 6 deletions unity-ads/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ dependencies {
ext {
GROUP_ID = "com.unity3d.ads"
ARTIFACT_ID = "unity-ads"
VERSION_ID = "3.7.4"
VERSION_CODE = 3740
VERSION_ID = "3.7.5"
VERSION_CODE = 3750
SIGN_AAR = properties.getProperty("SIGN_AAR") ?: false
}

Expand Down Expand Up @@ -74,10 +74,10 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
androidTestImplementation project(':unity-scaradapter-2000')
androidTestImplementation project(':unity-scaradapter-1950')
androidTestImplementation project(':unity-scaradapter-1920')
androidTestImplementation project(':unity-scaradapter-common')
androidTestCompileOnly project(':unity-scaradapter-2000')
androidTestCompileOnly project(':unity-scaradapter-1950')
androidTestCompileOnly project(':unity-scaradapter-1920')
androidTestCompileOnly project(':unity-scaradapter-common')
androidTestImplementation 'org.mockito:mockito-core:2.28.2'
androidTestImplementation 'org.mockito:mockito-android:2.25.0'
androidTestImplementation 'androidx.test:runner:1.3.0'
Expand Down
20 changes: 1 addition & 19 deletions unity-scaradapter-1920/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,4 @@ dependencies {
compileOnly 'com.google.android.gms:play-services-ads:19.2.0'
}


task deleteOldJar(type: Delete) {
delete("../unity-ads/libs/${project.name}.jar")
}

task copyJars(type: Copy) {
from('build/intermediates/compile_library_classes_jar/release/')
into('../unity-ads/libs/')
include('classes.jar')
rename('classes.jar', "${project.name}.jar")
}

copyJars.dependsOn(deleteOldJar)

project.tasks.whenTaskAdded { Task theTask ->
if (theTask.name == 'bundleLibCompileToJarRelease') {
theTask.finalizedBy(copyJars)
}
}
apply from: '../fatAar.gradle'
19 changes: 1 addition & 18 deletions unity-scaradapter-1950/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,4 @@ dependencies {
compileOnly 'com.google.android.gms:play-services-ads:19.5.0'
}

task deleteOldJar(type: Delete) {
delete("../unity-ads/libs/${project.name}.jar")
}

task copyJars(type: Copy) {
from('build/intermediates/compile_library_classes_jar/release/')
into('../unity-ads/libs/')
include('classes.jar')
rename('classes.jar', "${project.name}.jar")
}

copyJars.dependsOn(deleteOldJar)

project.tasks.whenTaskAdded { Task theTask ->
if (theTask.name == 'bundleLibCompileToJarRelease') {
theTask.finalizedBy(copyJars)
}
}
apply from: '../fatAar.gradle'
19 changes: 1 addition & 18 deletions unity-scaradapter-2000/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,4 @@ dependencies {
compileOnly 'com.google.android.gms:play-services-ads:20.1.0'
}

task deleteOldJar(type: Delete) {
delete("../unity-ads/libs/${project.name}.jar")
}

task copyJars(type: Copy) {
from('build/intermediates/compile_library_classes_jar/release/')
into('../unity-ads/libs/')
include('classes.jar')
rename('classes.jar', "${project.name}.jar")
}

copyJars.dependsOn(deleteOldJar)

project.tasks.whenTaskAdded { Task theTask ->
if (theTask.name == 'bundleLibCompileToJarRelease') {
theTask.finalizedBy(copyJars)
}
}
apply from: '../fatAar.gradle'
19 changes: 1 addition & 18 deletions unity-scaradapter-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,4 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
}

task deleteOldJar(type: Delete) {
delete("../unity-ads/libs/${project.name}.jar")
}

task copyJars(type: Copy) {
from('build/intermediates/compile_library_classes_jar/release/')
into('../unity-ads/libs/')
include('classes.jar')
rename('classes.jar', "${project.name}.jar")
}

copyJars.dependsOn(deleteOldJar)

project.tasks.whenTaskAdded { Task theTask ->
if (theTask.name == 'bundleLibCompileToJarRelease') {
theTask.finalizedBy(copyJars)
}
}
apply from: '../fatAar.gradle'

0 comments on commit 524eeba

Please sign in to comment.