Skip to content

Commit

Permalink
Recorder: Update Gradle wrapper to 8.10
Browse files Browse the repository at this point in the history
Since BuildConfig is deprecated we now get the package
name from the application context
We remove the app name from the service actions, as those
actions are to be handled only internally in the service,
they don't need to be specific.

Change-Id: I4205f7af457955b59790201a97ea60b8bec4d0aa
  • Loading branch information
luca020400 committed Sep 7, 2024
1 parent 7fdcf5e commit 1346277
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 39 deletions.
1 change: 0 additions & 1 deletion app/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ android_app {

srcs: [
"src/main/java/**/*.kt",
"src_aosp/main/java/**/*.kt",
],

product_specific: true,
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/org/lineageos/recorder/ListActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ class ListActivity : AppCompatActivity(), RecordingListCallbacks {
private fun loadRecordings() {
taskExecutor.runTask(
GetRecordingsTask(
applicationContext.packageName,
contentResolver
)
) { list: List<RecordingData> ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import android.util.Log
import androidx.annotation.GuardedBy
import androidx.core.app.NotificationCompat
import androidx.core.content.ContextCompat
import org.lineageos.recorder.BuildConfig
import org.lineageos.recorder.ListActivity
import org.lineageos.recorder.R
import org.lineageos.recorder.RecorderActivity
Expand Down Expand Up @@ -568,10 +567,10 @@ class SoundRecorderService : Service() {
companion object {
private const val TAG = "SoundRecorderService"

const val ACTION_START = "${BuildConfig.APPLICATION_ID}.service.START"
const val ACTION_STOP = "${BuildConfig.APPLICATION_ID}.service.STOP"
const val ACTION_PAUSE = "${BuildConfig.APPLICATION_ID}.service.PAUSE"
const val ACTION_RESUME = "${BuildConfig.APPLICATION_ID}.service.RESUME"
const val ACTION_START = "START"
const val ACTION_STOP = "STOP"
const val ACTION_PAUSE = "PAUSE"
const val ACTION_RESUME = "RESUME"

const val MSG_REGISTER_CLIENT = 0
const val MSG_UNREGISTER_CLIENT = 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ package org.lineageos.recorder.task
import android.content.ContentResolver
import android.content.ContentUris
import android.provider.MediaStore
import org.lineageos.recorder.BuildConfig
import org.lineageos.recorder.list.RecordingData
import java.time.Instant
import java.time.LocalDateTime
import java.time.ZoneId
import java.util.concurrent.Callable

class GetRecordingsTask(
private val packageName: String,
private val contentResolver: ContentResolver,
) : Callable<List<RecordingData>> {
override fun call(): List<RecordingData> {
Expand All @@ -26,7 +26,7 @@ class GetRecordingsTask(
PROJECTION,
"${MediaStore.Audio.Media.OWNER_PACKAGE_NAME}=?",
arrayOf(
BuildConfig.APPLICATION_ID,
packageName,
),
MY_RECORDS_SORT
)?.use { cursor ->
Expand Down
10 changes: 0 additions & 10 deletions app/src_aosp/main/java/org/lineageos/recorder/BuildConfig.kt

This file was deleted.

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
21 changes: 12 additions & 9 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -145,15 +148,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -202,11 +205,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
22 changes: 12 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down Expand Up @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down

0 comments on commit 1346277

Please sign in to comment.