Skip to content

Commit a87b076

Browse files
authored
Resolve build failures so repository will build with ./gradlew clean build (#584)
* Fix: Get ``./gradlew build`` to succeed This disables several checks to make the build succeed. We should try to enable the checks and fix the underlying issues. - Adds missing BLUETOOTH_CONNECT and BLUETOOTH_SCAN permissions to AndroidManifest.xml for BluetoothLe sample. - Adds ACCESS_COARSE_LOCATION and ACCESS_FINE_LOCATION to AndroidManifest.xml and uses tools:ignore to suppress the CoarseFineLocation warning. - Adds `@SuppressWarnings("MissingPermission")` annotations to setUpBLE methods in MainActivity.java and MainActivity.kt, and scanLeDevice method in DeviceScanActivity.kt to suppress lint warnings. - Increases Xmx value to 4g in gradle.properties. - Disables lint checks during release builds in gradle.properties. - Sets an icon to the Credential Provider in identity/credentialmanager/src/main/AndroidManifest.xml. * Revert gradle.properties to 6042848 * Use @RequiresPermission instead of @SuppressWarnings - @SuppressWarnings("MissingPermission") + @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT) * Simplify permissions ACCESS_FINE_LOCATION and ACCESS_COARSE_LOCATION * Revert compose/snippets/build.gradle.kts * Update build.yml and xr/build.gradle.kts - Add `./gradlew build` to build all modules used by the root project - Add --stacktrace to gradlew commands in build.yml - Update Kotlin jvmToolchain in xr/build.gradle.kts to 17 * Revert Kotlin jvmToolchain to 11 in xr/build.gradle.kts * Remove duplicate build.yml steps The following are redundant because they will run during `./gradlew build --stacktrace` - name: Build Compose run: ./gradlew :compose:snippets:build --stacktrace - name: Build recompose snippets run: ./gradlew :compose:recomposehighlighter:build --stacktrace - name: Build kotlin snippets run: ./gradlew :kotlin:build --stacktrace - name: Build Wear snippets run: ./gradlew :wear:build --stacktrace - name: Build misc snippets run: ./gradlew :misc:build --stacktrace - name: Build XR snippets run: ./gradlew :xr:build --stacktrace * Refactor build.yml to build all modules first
1 parent f643874 commit a87b076

File tree

7 files changed

+19
-21
lines changed

7 files changed

+19
-21
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,7 @@ jobs:
3737
with:
3838
distribution: 'zulu'
3939
java-version: '17'
40-
- name: Build Compose
41-
run: ./gradlew :compose:snippets:build
42-
- name: Build recompose snippets
43-
run: ./gradlew :compose:recomposehighlighter:build
44-
- name: Build kotlin snippets
45-
run: ./gradlew :kotlin:build
46-
- name: Build Wear snippets
47-
run: ./gradlew :wear:build
48-
- name: Build misc snippets
49-
run: ./gradlew :misc:build
50-
- name: Build XR snippets
51-
run: ./gradlew :xr:build
40+
- name: Build All
41+
run: ./gradlew build --stacktrace
5242
- name: Build Watch Face Push validation snippets
53-
run: ./gradlew :watchfacepush:validator:run
43+
run: ./gradlew :watchfacepush:validator:run --stacktrace

bluetoothle/src/main/AndroidManifest.xml

Lines changed: 2 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.sample.android.bluetoothle">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
65
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
@@ -23,6 +22,6 @@
2322
<uses-permission android:name="android.permission.BLUETOOTH" />
2423
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
2524

25+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
2626
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
27-
2827
</manifest>

bluetoothle/src/main/java/com/sample/android/bluetoothle/java/MainActivity.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
package com.sample.android.bluetoothle.java;
22

3-
import androidx.appcompat.app.AppCompatActivity;
4-
3+
import android.Manifest;
54
import android.bluetooth.BluetoothAdapter;
65
import android.bluetooth.BluetoothManager;
76
import android.content.Context;
87
import android.content.Intent;
98
import android.os.Bundle;
109

10+
import androidx.annotation.RequiresPermission;
11+
import androidx.appcompat.app.AppCompatActivity;
12+
1113
import com.sample.android.bluetoothle.R;
1214

1315
public class MainActivity extends AppCompatActivity {
@@ -19,6 +21,7 @@ protected void onCreate(Bundle savedInstanceState) {
1921
setContentView(R.layout.activity_main);
2022
}
2123

24+
@RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
2225
private void setUpBLE() {
2326
// [START get_bluetooth_adapter]
2427
// Initializes Bluetooth adapter.

bluetoothle/src/main/java/com/sample/android/bluetoothle/kotlin/DeviceScanActivity.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616

1717
package com.sample.android.bluetoothle.kotlin
1818

19+
import android.Manifest
1920
import android.app.ListActivity
2021
import android.bluetooth.BluetoothAdapter
2122
import android.bluetooth.le.ScanCallback
2223
import android.bluetooth.le.ScanResult
2324
import android.os.Handler
25+
import androidx.annotation.RequiresPermission
2426
import com.sample.android.bluetoothle.java.LeDeviceListAdapter
2527

2628
/**
@@ -47,6 +49,7 @@ class DeviceScanActivity : ListActivity() {
4749
// Stops scanning after 10 seconds.
4850
private val SCAN_PERIOD: Long = 10000
4951

52+
@RequiresPermission(Manifest.permission.BLUETOOTH_SCAN)
5053
private fun scanLeDevice() {
5154
if (!mScanning) { // Stops scanning after a pre-defined scan period.
5255
handler.postDelayed({

bluetoothle/src/main/java/com/sample/android/bluetoothle/kotlin/MainActivity.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616

1717
package com.sample.android.bluetoothle.kotlin
1818

19+
import android.Manifest
1920
import android.bluetooth.BluetoothAdapter
2021
import android.bluetooth.BluetoothManager
2122
import android.content.Context
2223
import android.content.Intent
2324
import android.os.Bundle
25+
import androidx.annotation.RequiresPermission
2426
import androidx.appcompat.app.AppCompatActivity
2527

2628
class MainActivity : AppCompatActivity() {
@@ -31,6 +33,7 @@ class MainActivity : AppCompatActivity() {
3133
super.onCreate(savedInstanceState)
3234
}
3335

36+
@RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
3437
private fun setUpBLE() {
3538
// [START get_bluetooth_adapter]
3639
// Initializes Bluetooth adapter.

identity/credentialmanager/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
android:enabled="true"
4646
android:exported="true"
4747
android:label="My Credential Provider"
48-
android:icon="<any drawable icon>"
48+
android:icon="@mipmap/ic_launcher"
4949
android:permission="android.permission.BIND_CREDENTIAL_PROVIDER_SERVICE"
5050
tools:targetApi="upside_down_cake">
5151
<intent-filter>

xr/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ android {
1919
sourceCompatibility = JavaVersion.VERSION_11
2020
targetCompatibility = JavaVersion.VERSION_11
2121
}
22-
kotlinOptions {
23-
jvmTarget = "11"
22+
kotlin {
23+
jvmToolchain(11)
2424
}
2525
buildFeatures {
2626
compose = true

0 commit comments

Comments
 (0)