Skip to content

Commit

Permalink
Release 4.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
runner authored and runner committed May 2, 2023
1 parent ce3cb3a commit 97924e9
Show file tree
Hide file tree
Showing 257 changed files with 6,790 additions and 3,949 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Unity Advertisements copyright © 2022 Unity Technologies.
Unity Advertisements copyright © 2023 Unity Technologies.
This software is subject to, and made available under, the terms of service for Operate Solutions (see https://unity3d.com/legal/one-operate-services-terms-of-service), and is an "Operate Service" as defined therein.

Your use of the Services constitutes your acceptance of such terms. Unless expressly provided otherwise, the software under this license is made available strictly on an "AS IS" BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the terms of service for details on these and other terms and conditions.
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 32
compileSdkVersion 33

defaultConfig {
applicationId "com.unity3d.ads.example"
minSdkVersion 19
targetSdkVersion 32
versionCode = 4610
versionName = "4.6.1"
targetSdkVersion 33
versionCode = 4700
versionName = "4.7.0"
}

buildTypes {
Expand Down
10 changes: 6 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@ allprojects {

buildscript {
ext {
kotlin_version = '1.4.32' // 1.5 deprecated Java6
coroutines_version = '1.4.3' // 1.6.0 deprecated Java6
kotlin_version = '1.8.10'
coroutines_version = '1.6.4'
dokka_version = '1.6.10'
startup_runtime_version = '1.1.1'
unity_identifiers_version = '1.0.0'
lifecycle_version = '2.5.1'
okhttp_version = '3.12.13' // 3.13+ requires Java8 / Android5+(21)
androidx_webkit = '1.6.1'
androidx_core = '1.9.0'
}

repositories {
Expand All @@ -21,8 +24,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.1.3'
classpath 'org.jacoco:org.jacoco.core:0.8.5'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.20.0'
classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
Expand Down
1 change: 1 addition & 0 deletions fatAar.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ static def tasksDependentOnScar(String buildType) {
"merge${buildType}JavaResource",
"sync${buildType}LibJars",
"extract${buildType}Annotations",
"desugar${buildType}FileDependencies",
"dokkaJavadoc"
]
}
Expand Down
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,7 @@ android.useAndroidX=true
android.disableAutomaticComponentCreation=true

signing.keyId=34500891
signing.secretKeyRingFile=../gpg-private-key.gpg
signing.secretKeyRingFile=../gpg-private-key.gpg

# https://kotlinlang.org/docs/whatsnew18.html#usage-of-the-latest-kotlin-stdlib-version-in-transitive-dependencies
kotlin.stdlib.jdk.variants.version.alignment=false

This comment has been minimized.

Copy link
@antohaby

antohaby Jun 20, 2024

Hey! Kotlin Gradle Plugin maintainer here. What was the motive to prevent jdk variants version alignment here?

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Apr 08 20:52:07 EDT 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
Loading

0 comments on commit 97924e9

Please sign in to comment.