Skip to content

Commit 2dc4fd7

Browse files
committed
Update Gradle and Android Plugins
We can now use a modern Java to build the native libraries.
1 parent bec7ff4 commit 2dc4fd7

File tree

20 files changed

+98
-58
lines changed

20 files changed

+98
-58
lines changed

build/cake/build-and-package.cake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ void BuildGradleProject (string root, string outputDir, bool moveFile)
9292
void RunGradle (DirectoryPath root, string target)
9393
{
9494
root = MakeAbsolute (root);
95+
96+
Information($"Running Gradle {target} in {root}");
9597

9698
var proc = IsRunningOnWindows ()
9799
? root.CombineWithFilePath ("gradlew.bat").FullPath
@@ -102,6 +104,8 @@ void RunGradle (DirectoryPath root, string target)
102104

103105
args += $" {target} -p {root}";
104106

107+
Information($"Running {proc} {args}");
108+
105109
var exitCode = StartProcess (proc, args);
106110

107111
if (exitCode != 0)

source/com.google.android.material/material.extensions/app/build.gradle

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 29
5-
buildToolsVersion "29.0.3"
4+
namespace 'com.xamarin.google.android.material.extensions.app'
5+
compileSdk 34
66

77
defaultConfig {
88
applicationId "com.xamarin.google.android.material.extensions.app"
9-
minSdkVersion 16
10-
targetSdkVersion 29
9+
minSdk 21
10+
targetSdk 34
1111
versionCode 1
1212
versionName "1.0"
1313

@@ -20,7 +20,11 @@ android {
2020
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2121
}
2222
}
23-
23+
24+
compileOptions {
25+
sourceCompatibility JavaVersion.VERSION_17
26+
targetCompatibility JavaVersion.VERSION_17
27+
}
2428
}
2529

2630
dependencies {

source/com.google.android.material/material.extensions/app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.xamarin.google.android.material.extensions.app">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application
65
android:allowBackup="true"
@@ -9,7 +8,8 @@
98
android:roundIcon="@mipmap/ic_launcher_round"
109
android:supportsRtl="true"
1110
android:theme="@style/AppTheme">
12-
<activity android:name=".MainActivity">
11+
<activity android:name=".MainActivity"
12+
android:exported="true">
1313
<intent-filter>
1414
<action android:name="android.intent.action.MAIN" />
1515

source/com.google.android.material/material.extensions/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ buildscript {
44

55
repositories {
66
google()
7-
jcenter()
7+
mavenCentral()
88

99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.6.2'
11+
classpath 'com.android.tools.build:gradle:8.12.0'
1212

1313

1414
// NOTE: Do not place your application dependencies here; they belong
@@ -19,7 +19,7 @@ buildscript {
1919
allprojects {
2020
repositories {
2121
google()
22-
jcenter()
22+
mavenCentral()
2323

2424
}
2525
}

source/com.google.android.material/material.extensions/extensions-aar/build.gradle

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 29
5-
buildToolsVersion "29.0.3"
4+
namespace 'com.xamarin.google.android.material.extensions'
5+
compileSdk 34
66

77
defaultConfig {
8-
minSdkVersion 16
9-
targetSdkVersion 29
8+
minSdk 21
9+
targetSdk 34
1010
versionCode 1
1111
versionName "1.0"
1212

@@ -20,7 +20,11 @@ android {
2020
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2121
}
2222
}
23-
23+
24+
compileOptions {
25+
sourceCompatibility JavaVersion.VERSION_17
26+
targetCompatibility JavaVersion.VERSION_17
27+
}
2428
}
2529

2630
dependencies {
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.xamarin.google.android.material.extensions" />
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
3+
</manifest>
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-6.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

source/com.google.android.play/asset.delivery.extensions/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
buildscript {
33
repositories {
44
google()
5-
jcenter()
5+
mavenCentral()
66
}
77
dependencies {
8-
classpath "com.android.tools.build:gradle:3.6.2"
8+
classpath "com.android.tools.build:gradle:8.12.0"
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files
@@ -15,7 +15,7 @@ buildscript {
1515
allprojects {
1616
repositories {
1717
google()
18-
jcenter()
18+
mavenCentral()
1919
}
2020
}
2121

source/com.google.android.play/asset.delivery.extensions/extensions-aar/build.gradle

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 29
5-
buildToolsVersion "30.0.2"
4+
namespace 'xamarin.google.android.play.asset.delivery'
5+
compileSdk 34
66

77
defaultConfig {
8-
minSdkVersion 21
9-
targetSdkVersion 29
8+
minSdk 21
9+
targetSdk 34
1010
versionCode 1
1111
versionName "1.0"
1212

@@ -20,9 +20,10 @@ android {
2020
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2121
}
2222
}
23+
2324
compileOptions {
24-
sourceCompatibility JavaVersion.VERSION_1_8
25-
targetCompatibility JavaVersion.VERSION_1_8
25+
sourceCompatibility JavaVersion.VERSION_17
26+
targetCompatibility JavaVersion.VERSION_17
2627
}
2728
}
2829

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="xamarin.google.android.play.asset.delivery">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32

4-
/
53
</manifest>

0 commit comments

Comments
 (0)