Compare commits
	
		
			2 Commits
		
	
	
		
			2.1
			...
			b25848c96c
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| b25848c96c | |||
| c373ac8109 | 
							
								
								
									
										185
									
								
								.gitea/workflows/publish.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										185
									
								
								.gitea/workflows/publish.yml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,185 @@
 | 
				
			|||||||
 | 
					name: 🚀 Créer une nouvelle version
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					on:
 | 
				
			||||||
 | 
					  workflow_dispatch:
 | 
				
			||||||
 | 
					    inputs:
 | 
				
			||||||
 | 
					      tag:
 | 
				
			||||||
 | 
					        description: 'Nom du tag (ex: v1.2.3)'
 | 
				
			||||||
 | 
					        required: true
 | 
				
			||||||
 | 
					      branche:
 | 
				
			||||||
 | 
					        description: 'Branche cible (ex: master)'
 | 
				
			||||||
 | 
					        default: 'master'
 | 
				
			||||||
 | 
					        required: true
 | 
				
			||||||
 | 
					      build_apk:
 | 
				
			||||||
 | 
					        description: 'Compiler et publier l’APK ?'
 | 
				
			||||||
 | 
					        required: true
 | 
				
			||||||
 | 
					        default: 'oui'
 | 
				
			||||||
 | 
					        type: choice
 | 
				
			||||||
 | 
					        options:
 | 
				
			||||||
 | 
					          - oui
 | 
				
			||||||
 | 
					          - non
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					jobs:
 | 
				
			||||||
 | 
					  release:
 | 
				
			||||||
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    steps:
 | 
				
			||||||
 | 
					      - name: 📦 Cloner le dépôt
 | 
				
			||||||
 | 
					        uses: actions/checkout@v3
 | 
				
			||||||
 | 
					        with:
 | 
				
			||||||
 | 
					          fetch-depth: 0  # important pour récupérer tout l'historique
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      - name: 🔧 Préparation de Git (tags)
 | 
				
			||||||
 | 
					        run: git fetch --tags
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      - name: 🔖 Détection du tag précédent
 | 
				
			||||||
 | 
					        id: tag-precedent
 | 
				
			||||||
 | 
					        run: |
 | 
				
			||||||
 | 
					          CURRENT_TAG="${{ github.event.inputs.tag }}"
 | 
				
			||||||
 | 
					          TAGS=$(git tag --sort=-creatordate)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					          if [ -z "$TAGS" ]; then
 | 
				
			||||||
 | 
					            echo "Aucun tag existant détecté."
 | 
				
			||||||
 | 
					            echo "tag_precedent=" >> $GITHUB_OUTPUT
 | 
				
			||||||
 | 
					            exit 0
 | 
				
			||||||
 | 
					          fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					          PREV_TAG=""
 | 
				
			||||||
 | 
					          FOUND=false
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					          for tag in $TAGS; do
 | 
				
			||||||
 | 
					            if [ "$FOUND" = true ]; then
 | 
				
			||||||
 | 
					              PREV_TAG=$tag
 | 
				
			||||||
 | 
					              break
 | 
				
			||||||
 | 
					            fi
 | 
				
			||||||
 | 
					            if [ "$tag" = "$CURRENT_TAG" ]; then
 | 
				
			||||||
 | 
					              FOUND=true
 | 
				
			||||||
 | 
					            fi
 | 
				
			||||||
 | 
					          done
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					          echo "tag_precedent=$PREV_TAG" >> $GITHUB_OUTPUT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      - name: 📝 Liste des modifications
 | 
				
			||||||
 | 
					        id: changelog
 | 
				
			||||||
 | 
					        run: |
 | 
				
			||||||
 | 
					          PREV_TAG="${{ steps.tag-precedent.outputs.tag_precedent }}"
 | 
				
			||||||
 | 
					          TARGET_TAG="${{ github.event.inputs.tag }}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					          if [ -z "$PREV_TAG" ]; then
 | 
				
			||||||
 | 
					            LOG=$(git log --oneline)
 | 
				
			||||||
 | 
					          else
 | 
				
			||||||
 | 
					            if git rev-parse "$TARGET_TAG" >/dev/null 2>&1; then
 | 
				
			||||||
 | 
					              LOG=$(git log "$PREV_TAG".."$TARGET_TAG" --oneline)
 | 
				
			||||||
 | 
					            else
 | 
				
			||||||
 | 
					              LOG=$(git log "$PREV_TAG"..HEAD --oneline)
 | 
				
			||||||
 | 
					            fi
 | 
				
			||||||
 | 
					          fi
 | 
				
			||||||
 | 
					          echo "$LOG"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					          echo "modifications<<EOF" >> $GITHUB_OUTPUT
 | 
				
			||||||
 | 
					          echo "$LOG" >> $GITHUB_OUTPUT
 | 
				
			||||||
 | 
					          echo "EOF" >> $GITHUB_OUTPUT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      - name: 🏷️ Créer le tag si nécessaire
 | 
				
			||||||
 | 
					        run: |
 | 
				
			||||||
 | 
					          TAG="${{ github.event.inputs.tag }}"
 | 
				
			||||||
 | 
					          if git rev-parse "$TAG" >/dev/null 2>&1; then
 | 
				
			||||||
 | 
					            echo "Le tag $TAG existe déjà, pas besoin de le créer."
 | 
				
			||||||
 | 
					          else
 | 
				
			||||||
 | 
					            git config user.name "github-actions"
 | 
				
			||||||
 | 
					            git config user.email "github-actions@github.com"
 | 
				
			||||||
 | 
					            git tag "$TAG"
 | 
				
			||||||
 | 
					            git push origin "$TAG"
 | 
				
			||||||
 | 
					          fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      - name: 📦 Création de la version sur Gitea
 | 
				
			||||||
 | 
					        id: creation-release
 | 
				
			||||||
 | 
					        env:
 | 
				
			||||||
 | 
					          REGISTRY_URL: ${{ vars.REGISTRY_URL }}
 | 
				
			||||||
 | 
					          REPO: ${{ vars.REGISTRY_REPOSITORY }}
 | 
				
			||||||
 | 
					          TOKEN: ${{ secrets.REGISTRY_PASSWORD }}
 | 
				
			||||||
 | 
					          COMMITS: ${{ steps.changelog.outputs.modifications }}
 | 
				
			||||||
 | 
					        run: |
 | 
				
			||||||
 | 
					          TAG_NAME="${{ github.event.inputs.tag }}"
 | 
				
			||||||
 | 
					          BRANCHE="${{ github.event.inputs.branche }}"
 | 
				
			||||||
 | 
					          
 | 
				
			||||||
 | 
					          # Échappement du contenu pour JSON
 | 
				
			||||||
 | 
					          DESCRIPTION="Changelog:"$'\n'"$COMMITS"
 | 
				
			||||||
 | 
					          ESCAPED_DESCRIPTION=$(printf '%s\n' "$DESCRIPTION" | jq -Rsa .)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					          REPONSE=$(curl -s -X POST "https://$REGISTRY_URL/api/v1/repos/$REPO/releases" \
 | 
				
			||||||
 | 
					            -H "Content-Type: application/json" \
 | 
				
			||||||
 | 
					            -H "Authorization: token $TOKEN" \
 | 
				
			||||||
 | 
					            -d "{
 | 
				
			||||||
 | 
					              \"tag_name\": \"$TAG_NAME\",
 | 
				
			||||||
 | 
					              \"target\": \"$BRANCHE\",
 | 
				
			||||||
 | 
					              \"name\": \"Version $TAG_NAME\",
 | 
				
			||||||
 | 
					              \"body\": $ESCAPED_DESCRIPTION
 | 
				
			||||||
 | 
					            }")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					          echo "$REPONSE"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					          ID_RELEASE=$(echo "$REPONSE" | jq -r .id)
 | 
				
			||||||
 | 
					          echo "id_release=$ID_RELEASE" >> $GITHUB_OUTPUT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      - name: 🔍️ Extraire les informations de l’application
 | 
				
			||||||
 | 
					        id: extraire-info-gradle
 | 
				
			||||||
 | 
					        if: ${{ github.event.inputs.build_apk == 'oui' }}
 | 
				
			||||||
 | 
					        run: |
 | 
				
			||||||
 | 
					          APP_NAME=$(grep 'rootProject.name' settings.gradle | sed -E 's/.*= "(.*)"/\1/')
 | 
				
			||||||
 | 
					          COMPILE_SDK_VERSION=$(grep 'compileSdk' app/build.gradle | grep -oE '[0-9]+')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					          echo "app_name=$APP_NAME" >> $GITHUB_OUTPUT
 | 
				
			||||||
 | 
					          echo "compile_sdk_version=$COMPILE_SDK_VERSION" >> $GITHUB_OUTPUT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      - name: ☕ Configurer Java
 | 
				
			||||||
 | 
					        if: ${{ github.event.inputs.build_apk == 'oui' }}
 | 
				
			||||||
 | 
					        uses: actions/setup-java@v3
 | 
				
			||||||
 | 
					        with:
 | 
				
			||||||
 | 
					          distribution: 'temurin'
 | 
				
			||||||
 | 
					          java-version: '17'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      - name: 🤖 Installer Android SDK
 | 
				
			||||||
 | 
					        if: ${{ github.event.inputs.build_apk == 'oui' }}
 | 
				
			||||||
 | 
					        uses: android-actions/setup-android@v3
 | 
				
			||||||
 | 
					        with:
 | 
				
			||||||
 | 
					          api-level: ${{ steps.extraire-info-gradle.outputs.compile_sdk_version }}
 | 
				
			||||||
 | 
					          build-tools-version: ${{ steps.extraire-info-gradle.outputs.compile_sdk_version }}.0.3
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      - name: 🛠️ Compilation de l’application (APK)
 | 
				
			||||||
 | 
					        if: ${{ github.event.inputs.build_apk == 'oui' }}
 | 
				
			||||||
 | 
					        run: ./gradlew assembleRelease
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      - name: 🏷️ Renommer l’APK avec le nom de l’application et le tag
 | 
				
			||||||
 | 
					        id: renommer-apk
 | 
				
			||||||
 | 
					        if: ${{ github.event.inputs.build_apk == 'oui' }}
 | 
				
			||||||
 | 
					        env:
 | 
				
			||||||
 | 
					          APP_NAME=${{ steps.extraire-info-gradle.outputs.app_name }}
 | 
				
			||||||
 | 
					          TAG=${{ github.event.inputs.tag }}
 | 
				
			||||||
 | 
					          APK_DIR="app/build/outputs/apk/release"
 | 
				
			||||||
 | 
					        run: |
 | 
				
			||||||
 | 
					          APKs=""
 | 
				
			||||||
 | 
					          for apk in "$APK_DIR"/*.apk; do
 | 
				
			||||||
 | 
					            BASENAME=$(basename "$apk")                          # ex: app-release-unsigned.apk
 | 
				
			||||||
 | 
					            SUFFIX=${BASENAME#app}                              # ex: -release-unsigned.apk
 | 
				
			||||||
 | 
					            NEW_NAME="${APP_NAME}${SUFFIX%\.apk}_${TAG}.apk"   # ex: MonApp-release-unsigned_v1.2.3.apk
 | 
				
			||||||
 | 
					            mv "$apk" "$APK_DIR/$NEW_NAME"
 | 
				
			||||||
 | 
					            APKs+=" $APK_DIR/$NEW_NAME"
 | 
				
			||||||
 | 
					          done
 | 
				
			||||||
 | 
					          echo "apk_files=$APKs" >> $GITHUB_OUTPUT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      - name: 📤 Téléversement de l’APK dans la version
 | 
				
			||||||
 | 
					        if: ${{ github.event.inputs.build_apk == 'oui' }}
 | 
				
			||||||
 | 
					        env:
 | 
				
			||||||
 | 
					          GITEA_URL: ${{ vars.REGISTRY_URL }}
 | 
				
			||||||
 | 
					          REPO: ${{ vars.REGISTRY_REPOSITORY }}
 | 
				
			||||||
 | 
					          TOKEN: ${{ secrets.REGISTRY_PASSWORD }}
 | 
				
			||||||
 | 
					          RELEASE_ID: ${{ steps.creation-release.outputs.id_release }}
 | 
				
			||||||
 | 
					        run: |
 | 
				
			||||||
 | 
					          for apk in ${{ steps.renommer-apk.outputs.apk_files }}; do
 | 
				
			||||||
 | 
					            curl -s -X POST "$GITEA_URL/api/v1/repos/$REPO/releases/$RELEASE_ID/assets" \
 | 
				
			||||||
 | 
					              -H "Authorization: token $TOKEN" \
 | 
				
			||||||
 | 
					              -F attachment=@"$apk"
 | 
				
			||||||
 | 
					          done
 | 
				
			||||||
							
								
								
									
										1
									
								
								.idea/.name
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								.idea/.name
									
									
									
										generated
									
									
									
										Normal file
									
								
							@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					LocalTransfer
 | 
				
			||||||
							
								
								
									
										6
									
								
								.idea/AndroidProjectSystem.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								.idea/AndroidProjectSystem.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							@ -0,0 +1,6 @@
 | 
				
			|||||||
 | 
					<?xml version="1.0" encoding="UTF-8"?>
 | 
				
			||||||
 | 
					<project version="4">
 | 
				
			||||||
 | 
					  <component name="AndroidProjectSystem">
 | 
				
			||||||
 | 
					    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
 | 
				
			||||||
 | 
					  </component>
 | 
				
			||||||
 | 
					</project>
 | 
				
			||||||
							
								
								
									
										2
									
								
								.idea/compiler.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2
									
								
								.idea/compiler.xml
									
									
									
										generated
									
									
									
								
							@ -1,6 +1,6 @@
 | 
				
			|||||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
					<?xml version="1.0" encoding="UTF-8"?>
 | 
				
			||||||
<project version="4">
 | 
					<project version="4">
 | 
				
			||||||
  <component name="CompilerConfiguration">
 | 
					  <component name="CompilerConfiguration">
 | 
				
			||||||
    <bytecodeTargetLevel target="11" />
 | 
					    <bytecodeTargetLevel target="17" />
 | 
				
			||||||
  </component>
 | 
					  </component>
 | 
				
			||||||
</project>
 | 
					</project>
 | 
				
			||||||
							
								
								
									
										10
									
								
								.idea/deploymentTargetSelector.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								.idea/deploymentTargetSelector.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							@ -0,0 +1,10 @@
 | 
				
			|||||||
 | 
					<?xml version="1.0" encoding="UTF-8"?>
 | 
				
			||||||
 | 
					<project version="4">
 | 
				
			||||||
 | 
					  <component name="deploymentTargetSelector">
 | 
				
			||||||
 | 
					    <selectionStates>
 | 
				
			||||||
 | 
					      <SelectionState runConfigName="app">
 | 
				
			||||||
 | 
					        <option name="selectionMode" value="DROPDOWN" />
 | 
				
			||||||
 | 
					      </SelectionState>
 | 
				
			||||||
 | 
					    </selectionStates>
 | 
				
			||||||
 | 
					  </component>
 | 
				
			||||||
 | 
					</project>
 | 
				
			||||||
							
								
								
									
										5
									
								
								.idea/gradle.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										5
									
								
								.idea/gradle.xml
									
									
									
										generated
									
									
									
								
							@ -4,16 +4,15 @@
 | 
				
			|||||||
  <component name="GradleSettings">
 | 
					  <component name="GradleSettings">
 | 
				
			||||||
    <option name="linkedExternalProjectsSettings">
 | 
					    <option name="linkedExternalProjectsSettings">
 | 
				
			||||||
      <GradleProjectSettings>
 | 
					      <GradleProjectSettings>
 | 
				
			||||||
        <option name="testRunner" value="GRADLE" />
 | 
					        <option name="testRunner" value="CHOOSE_PER_TEST" />
 | 
				
			||||||
        <option name="distributionType" value="DEFAULT_WRAPPED" />
 | 
					 | 
				
			||||||
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
 | 
					        <option name="externalProjectPath" value="$PROJECT_DIR$" />
 | 
				
			||||||
 | 
					        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
 | 
				
			||||||
        <option name="modules">
 | 
					        <option name="modules">
 | 
				
			||||||
          <set>
 | 
					          <set>
 | 
				
			||||||
            <option value="$PROJECT_DIR$" />
 | 
					            <option value="$PROJECT_DIR$" />
 | 
				
			||||||
            <option value="$PROJECT_DIR$/app" />
 | 
					            <option value="$PROJECT_DIR$/app" />
 | 
				
			||||||
          </set>
 | 
					          </set>
 | 
				
			||||||
        </option>
 | 
					        </option>
 | 
				
			||||||
        <option name="resolveModulePerSourceSet" value="false" />
 | 
					 | 
				
			||||||
      </GradleProjectSettings>
 | 
					      </GradleProjectSettings>
 | 
				
			||||||
    </option>
 | 
					    </option>
 | 
				
			||||||
  </component>
 | 
					  </component>
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										10
									
								
								.idea/migrations.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								.idea/migrations.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							@ -0,0 +1,10 @@
 | 
				
			|||||||
 | 
					<?xml version="1.0" encoding="UTF-8"?>
 | 
				
			||||||
 | 
					<project version="4">
 | 
				
			||||||
 | 
					  <component name="ProjectMigrations">
 | 
				
			||||||
 | 
					    <option name="MigrateToGradleLocalJavaHome">
 | 
				
			||||||
 | 
					      <set>
 | 
				
			||||||
 | 
					        <option value="$PROJECT_DIR$" />
 | 
				
			||||||
 | 
					      </set>
 | 
				
			||||||
 | 
					    </option>
 | 
				
			||||||
 | 
					  </component>
 | 
				
			||||||
 | 
					</project>
 | 
				
			||||||
							
								
								
									
										10
									
								
								.idea/misc.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										10
									
								
								.idea/misc.xml
									
									
									
										generated
									
									
									
								
							@ -16,7 +16,7 @@
 | 
				
			|||||||
    <option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
 | 
					    <option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
 | 
				
			||||||
    <option name="myNullables">
 | 
					    <option name="myNullables">
 | 
				
			||||||
      <value>
 | 
					      <value>
 | 
				
			||||||
        <list size="14">
 | 
					        <list size="16">
 | 
				
			||||||
          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
 | 
					          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
 | 
				
			||||||
          <item index="1" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
 | 
					          <item index="1" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
 | 
				
			||||||
          <item index="2" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
 | 
					          <item index="2" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
 | 
				
			||||||
@ -31,12 +31,14 @@
 | 
				
			|||||||
          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
 | 
					          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
 | 
				
			||||||
          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
 | 
					          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
 | 
				
			||||||
          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
 | 
					          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
 | 
				
			||||||
 | 
					          <item index="14" class="java.lang.String" itemvalue="org.jspecify.annotations.Nullable" />
 | 
				
			||||||
 | 
					          <item index="15" class="java.lang.String" itemvalue="jakarta.annotation.Nullable" />
 | 
				
			||||||
        </list>
 | 
					        </list>
 | 
				
			||||||
      </value>
 | 
					      </value>
 | 
				
			||||||
    </option>
 | 
					    </option>
 | 
				
			||||||
    <option name="myNotNulls">
 | 
					    <option name="myNotNulls">
 | 
				
			||||||
      <value>
 | 
					      <value>
 | 
				
			||||||
        <list size="14">
 | 
					        <list size="16">
 | 
				
			||||||
          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
 | 
					          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
 | 
				
			||||||
          <item index="1" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
 | 
					          <item index="1" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
 | 
				
			||||||
          <item index="2" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
 | 
					          <item index="2" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
 | 
				
			||||||
@ -51,11 +53,13 @@
 | 
				
			|||||||
          <item index="11" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
 | 
					          <item index="11" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
 | 
				
			||||||
          <item index="12" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
 | 
					          <item index="12" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
 | 
				
			||||||
          <item index="13" class="java.lang.String" itemvalue="lombok.NonNull" />
 | 
					          <item index="13" class="java.lang.String" itemvalue="lombok.NonNull" />
 | 
				
			||||||
 | 
					          <item index="14" class="java.lang.String" itemvalue="org.jspecify.annotations.NonNull" />
 | 
				
			||||||
 | 
					          <item index="15" class="java.lang.String" itemvalue="jakarta.annotation.Nonnull" />
 | 
				
			||||||
        </list>
 | 
					        </list>
 | 
				
			||||||
      </value>
 | 
					      </value>
 | 
				
			||||||
    </option>
 | 
					    </option>
 | 
				
			||||||
  </component>
 | 
					  </component>
 | 
				
			||||||
  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
 | 
					  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="temurin-17" project-jdk-type="JavaSDK">
 | 
				
			||||||
    <output url="file://$PROJECT_DIR$/build/classes" />
 | 
					    <output url="file://$PROJECT_DIR$/build/classes" />
 | 
				
			||||||
  </component>
 | 
					  </component>
 | 
				
			||||||
  <component name="ProjectType">
 | 
					  <component name="ProjectType">
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										17
									
								
								.idea/runConfigurations.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								.idea/runConfigurations.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							@ -0,0 +1,17 @@
 | 
				
			|||||||
 | 
					<?xml version="1.0" encoding="UTF-8"?>
 | 
				
			||||||
 | 
					<project version="4">
 | 
				
			||||||
 | 
					  <component name="RunConfigurationProducerService">
 | 
				
			||||||
 | 
					    <option name="ignoredProducers">
 | 
				
			||||||
 | 
					      <set>
 | 
				
			||||||
 | 
					        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
 | 
				
			||||||
 | 
					        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
 | 
				
			||||||
 | 
					        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
 | 
				
			||||||
 | 
					        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
 | 
				
			||||||
 | 
					        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
 | 
				
			||||||
 | 
					        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
 | 
				
			||||||
 | 
					        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
 | 
				
			||||||
 | 
					        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
 | 
				
			||||||
 | 
					      </set>
 | 
				
			||||||
 | 
					    </option>
 | 
				
			||||||
 | 
					  </component>
 | 
				
			||||||
 | 
					</project>
 | 
				
			||||||
@ -1,41 +1,38 @@
 | 
				
			|||||||
apply plugin: 'com.android.application'
 | 
					apply plugin: 'com.android.application'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
android {
 | 
					android {
 | 
				
			||||||
    compileSdkVersion 30
 | 
					    compileSdk 35
 | 
				
			||||||
 | 
					 | 
				
			||||||
    defaultConfig {
 | 
					    defaultConfig {
 | 
				
			||||||
        applicationId "com.localtransfer"
 | 
					        applicationId "com.localtransfer"
 | 
				
			||||||
        minSdkVersion 24
 | 
					        minSdkVersion 27
 | 
				
			||||||
        targetSdkVersion 30
 | 
					        targetSdkVersion 35
 | 
				
			||||||
        versionCode 1
 | 
					        versionCode 1
 | 
				
			||||||
        versionName "2.0"
 | 
					        versionName "3.0"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 | 
					        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    buildTypes {
 | 
					    buildTypes {
 | 
				
			||||||
        release {
 | 
					        release {
 | 
				
			||||||
            minifyEnabled false
 | 
					            minifyEnabled true
 | 
				
			||||||
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
 | 
					            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    compileOptions {
 | 
					    compileOptions {
 | 
				
			||||||
        sourceCompatibility JavaVersion.VERSION_11
 | 
					        sourceCompatibility JavaVersion.VERSION_17
 | 
				
			||||||
        targetCompatibility JavaVersion.VERSION_11
 | 
					        targetCompatibility JavaVersion.VERSION_17
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					    namespace 'com.localtransfer'
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
dependencies {
 | 
					dependencies {
 | 
				
			||||||
    implementation fileTree(dir: "libs", include: ["*.jar"])
 | 
					    implementation 'androidx.appcompat:appcompat:1.7.1'
 | 
				
			||||||
    implementation 'androidx.appcompat:appcompat:1.2.0'
 | 
					    implementation 'com.google.android.material:material:1.12.0'
 | 
				
			||||||
    implementation 'com.google.android.material:material:1.2.1'
 | 
					    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
 | 
				
			||||||
    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 | 
					 | 
				
			||||||
    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 | 
					    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 | 
				
			||||||
    implementation 'androidx.preference:preference:1.1.1'
 | 
					    implementation 'androidx.preference:preference:1.2.1'
 | 
				
			||||||
    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 | 
					    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 | 
				
			||||||
    testImplementation 'junit:junit:4.13.1'
 | 
					    testImplementation 'junit:junit:4.13.2'
 | 
				
			||||||
    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
 | 
					    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
 | 
				
			||||||
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 | 
					    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 | 
				
			||||||
    implementation 'lib.kashif:folderpicker:2.4'
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@ -1,26 +0,0 @@
 | 
				
			|||||||
package com.localtransfer;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import android.content.Context;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import androidx.test.platform.app.InstrumentationRegistry;
 | 
					 | 
				
			||||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import org.junit.Test;
 | 
					 | 
				
			||||||
import org.junit.runner.RunWith;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import static org.junit.Assert.*;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**
 | 
					 | 
				
			||||||
 * Instrumented test, which will execute on an Android device.
 | 
					 | 
				
			||||||
 *
 | 
					 | 
				
			||||||
 * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
@RunWith(AndroidJUnit4.class)
 | 
					 | 
				
			||||||
public class ExampleInstrumentedTest {
 | 
					 | 
				
			||||||
    @Test
 | 
					 | 
				
			||||||
    public void useAppContext() {
 | 
					 | 
				
			||||||
        // Context of the app under test.
 | 
					 | 
				
			||||||
        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 | 
					 | 
				
			||||||
        assertEquals("com.localtransfer", appContext.getPackageName());
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
@ -1,8 +1,9 @@
 | 
				
			|||||||
<?xml version="1.0" encoding="utf-8"?>
 | 
					<?xml version="1.0" encoding="utf-8"?>
 | 
				
			||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 | 
					<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 | 
				
			||||||
    package="com.localtransfer">
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 | 
				
			||||||
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 | 
					    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 | 
				
			||||||
 | 
					    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 | 
				
			||||||
    <uses-permission
 | 
					    <uses-permission
 | 
				
			||||||
        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
 | 
					        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
 | 
				
			||||||
        android:maxSdkVersion="28" />
 | 
					        android:maxSdkVersion="28" />
 | 
				
			||||||
@ -19,8 +20,8 @@
 | 
				
			|||||||
        android:theme="@style/AppTheme">
 | 
					        android:theme="@style/AppTheme">
 | 
				
			||||||
        <service
 | 
					        <service
 | 
				
			||||||
            android:name=".TransferService"
 | 
					            android:name=".TransferService"
 | 
				
			||||||
            android:enabled="true"
 | 
					            android:exported="false"
 | 
				
			||||||
            android:exported="true"></service>
 | 
					            android:foregroundServiceType="dataSync" />
 | 
				
			||||||
        <!-- android:usesCleartextTraffic="true" -->
 | 
					        <!-- android:usesCleartextTraffic="true" -->
 | 
				
			||||||
        <provider
 | 
					        <provider
 | 
				
			||||||
            android:name="androidx.core.content.FileProvider"
 | 
					            android:name="androidx.core.content.FileProvider"
 | 
				
			||||||
@ -34,9 +35,10 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        <activity
 | 
					        <activity
 | 
				
			||||||
            android:name=".SettingsActivity"
 | 
					            android:name=".SettingsActivity"
 | 
				
			||||||
            android:label="@string/title_activity_settings"></activity>
 | 
					            android:label="@string/title_activity_settings" />
 | 
				
			||||||
        <activity
 | 
					        <activity
 | 
				
			||||||
            android:name=".MainActivity"
 | 
					            android:name=".MainActivity"
 | 
				
			||||||
 | 
					            android:exported="true"
 | 
				
			||||||
            android:label="@string/app_name"
 | 
					            android:label="@string/app_name"
 | 
				
			||||||
            android:theme="@style/AppTheme.NoActionBar">
 | 
					            android:theme="@style/AppTheme.NoActionBar">
 | 
				
			||||||
            <intent-filter>
 | 
					            <intent-filter>
 | 
				
			||||||
 | 
				
			|||||||
@ -72,7 +72,7 @@ public class MainActivity extends AppCompatActivity {
 | 
				
			|||||||
        Transfer.resolver = this.getContentResolver();
 | 
					        Transfer.resolver = this.getContentResolver();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        Intent notificationIntent = new Intent(this, MainActivity.class);
 | 
					        Intent notificationIntent = new Intent(this, MainActivity.class);
 | 
				
			||||||
        Transfer.pendingIntent = PendingIntent.getActivity(this,0, notificationIntent, 0);
 | 
					        Transfer.pendingIntent = PendingIntent.getActivity(this,0, notificationIntent, PendingIntent.FLAG_IMMUTABLE);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 | 
					        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -244,6 +244,7 @@ public class MainActivity extends AppCompatActivity {
 | 
				
			|||||||
    public void onRequestPermissionsResult(int requestCode,
 | 
					    public void onRequestPermissionsResult(int requestCode,
 | 
				
			||||||
                                           String permissions[],
 | 
					                                           String permissions[],
 | 
				
			||||||
                                           int[] grantResults) {
 | 
					                                           int[] grantResults) {
 | 
				
			||||||
 | 
					        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
 | 
				
			||||||
        switch (requestCode) {
 | 
					        switch (requestCode) {
 | 
				
			||||||
            case REQUEST_ID_READ_EXTERNAL_STORAGE:
 | 
					            case REQUEST_ID_READ_EXTERNAL_STORAGE:
 | 
				
			||||||
                if (grantResults.length > 0 &&
 | 
					                if (grantResults.length > 0 &&
 | 
				
			||||||
 | 
				
			|||||||
@ -19,8 +19,6 @@ import androidx.preference.PreferenceFragmentCompat;
 | 
				
			|||||||
import androidx.preference.PreferenceManager;
 | 
					import androidx.preference.PreferenceManager;
 | 
				
			||||||
import androidx.preference.SwitchPreference;
 | 
					import androidx.preference.SwitchPreference;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import lib.folderpicker.FolderPicker;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
public class SettingsActivity extends AppCompatActivity {
 | 
					public class SettingsActivity extends AppCompatActivity {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
@ -76,7 +74,8 @@ public class SettingsActivity extends AppCompatActivity {
 | 
				
			|||||||
            directory.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
 | 
					            directory.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
 | 
				
			||||||
                @Override
 | 
					                @Override
 | 
				
			||||||
                public boolean onPreferenceClick(Preference preference) {
 | 
					                public boolean onPreferenceClick(Preference preference) {
 | 
				
			||||||
                    Intent intent = new Intent(getContext(), FolderPicker.class);
 | 
					                    Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
 | 
				
			||||||
 | 
					                    intent.addCategory(Intent.CATEGORY_DEFAULT);
 | 
				
			||||||
                    startActivityForResult(intent, REQUEST_DIRECTORY_PICKER);
 | 
					                    startActivityForResult(intent, REQUEST_DIRECTORY_PICKER);
 | 
				
			||||||
                    return false;
 | 
					                    return false;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
				
			|||||||
@ -2,12 +2,14 @@ package com.localtransfer;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import static java.lang.Integer.valueOf;
 | 
					import static java.lang.Integer.valueOf;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import android.Manifest;
 | 
				
			||||||
import android.app.Activity;
 | 
					import android.app.Activity;
 | 
				
			||||||
import android.app.Notification;
 | 
					import android.app.Notification;
 | 
				
			||||||
import android.app.PendingIntent;
 | 
					import android.app.PendingIntent;
 | 
				
			||||||
import android.content.ContentResolver;
 | 
					import android.content.ContentResolver;
 | 
				
			||||||
import android.content.Context;
 | 
					import android.content.Context;
 | 
				
			||||||
import android.content.SharedPreferences;
 | 
					import android.content.SharedPreferences;
 | 
				
			||||||
 | 
					import android.content.pm.PackageManager;
 | 
				
			||||||
import android.graphics.Color;
 | 
					import android.graphics.Color;
 | 
				
			||||||
import android.util.Log;
 | 
					import android.util.Log;
 | 
				
			||||||
import android.view.LayoutInflater;
 | 
					import android.view.LayoutInflater;
 | 
				
			||||||
@ -18,6 +20,7 @@ import android.widget.ProgressBar;
 | 
				
			|||||||
import android.widget.TextView;
 | 
					import android.widget.TextView;
 | 
				
			||||||
import android.widget.Toast;
 | 
					import android.widget.Toast;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import androidx.core.app.ActivityCompat;
 | 
				
			||||||
import androidx.core.app.NotificationManagerCompat;
 | 
					import androidx.core.app.NotificationManagerCompat;
 | 
				
			||||||
import androidx.preference.PreferenceManager;
 | 
					import androidx.preference.PreferenceManager;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -202,6 +205,16 @@ public class Transfer {
 | 
				
			|||||||
                        .setContentText(String.format("%d%% %s/%s", percent, loadedSI, sizeSI))
 | 
					                        .setContentText(String.format("%d%% %s/%s", percent, loadedSI, sizeSI))
 | 
				
			||||||
                        .setProgress(100, (int) percent, false)
 | 
					                        .setProgress(100, (int) percent, false)
 | 
				
			||||||
                        .setContentIntent(pendingIntent);
 | 
					                        .setContentIntent(pendingIntent);
 | 
				
			||||||
 | 
					                if (ActivityCompat.checkSelfPermission(activity, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
 | 
				
			||||||
 | 
					                    // TODO: Consider calling
 | 
				
			||||||
 | 
					                    //    ActivityCompat#requestPermissions
 | 
				
			||||||
 | 
					                    // here to request the missing permissions, and then overriding
 | 
				
			||||||
 | 
					                    //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
 | 
				
			||||||
 | 
					                    //                                          int[] grantResults)
 | 
				
			||||||
 | 
					                    // to handle the case where the user grants the permission. See the documentation
 | 
				
			||||||
 | 
					                    // for ActivityCompat#requestPermissions for more details.
 | 
				
			||||||
 | 
					                    return;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
                notifiManager.notify(Transfer.NOTIF_SERVICE, notifBuilder.build());
 | 
					                notifiManager.notify(Transfer.NOTIF_SERVICE, notifBuilder.build());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                if (app_started && fragment_on)
 | 
					                if (app_started && fragment_on)
 | 
				
			||||||
 | 
				
			|||||||
@ -20,7 +20,7 @@ public class TransferService extends Service {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        Intent notificationIntent = new Intent(this, MainActivity.class);
 | 
					        Intent notificationIntent = new Intent(this, MainActivity.class);
 | 
				
			||||||
        PendingIntent pendingIntent = PendingIntent.getActivity(this,
 | 
					        PendingIntent pendingIntent = PendingIntent.getActivity(this,
 | 
				
			||||||
                0, notificationIntent, 0);
 | 
					                0, notificationIntent, PendingIntent.FLAG_IMMUTABLE);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        Notification notification = new NotificationCompat.Builder(this, "CHANNEL_ID")
 | 
					        Notification notification = new NotificationCompat.Builder(this, "CHANNEL_ID")
 | 
				
			||||||
                .setContentIntent(pendingIntent)
 | 
					                .setContentIntent(pendingIntent)
 | 
				
			||||||
 | 
				
			|||||||
@ -23,11 +23,11 @@
 | 
				
			|||||||
    <!-- Server Preferences -->
 | 
					    <!-- Server Preferences -->
 | 
				
			||||||
    <string name="server_host">Host</string>
 | 
					    <string name="server_host">Host</string>
 | 
				
			||||||
    <string name="server_protocol">Use secure https</string>
 | 
					    <string name="server_protocol">Use secure https</string>
 | 
				
			||||||
    <string name="server_host_def">www.netdldata.net</string>
 | 
					    <string name="server_host_def">transfer.netdldata.net</string>
 | 
				
			||||||
    <string name="server_port">Port</string>
 | 
					    <string name="server_port">Port</string>
 | 
				
			||||||
    <string name="server_port_def"></string>
 | 
					    <string name="server_port_def"></string>
 | 
				
			||||||
    <string name="server_root">Root</string>
 | 
					    <string name="server_root">Root</string>
 | 
				
			||||||
    <string name="server_root_def">/transfer</string>
 | 
					    <string name="server_root_def">/php</string>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <!-- Local Preferences -->
 | 
					    <!-- Local Preferences -->
 | 
				
			||||||
    <string name="use_shared_storage">Use shared storage</string>
 | 
					    <string name="use_shared_storage">Use shared storage</string>
 | 
				
			||||||
 | 
				
			|||||||
@ -1,17 +0,0 @@
 | 
				
			|||||||
package com.localtransfer;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import org.junit.Test;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import static org.junit.Assert.*;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**
 | 
					 | 
				
			||||||
 * Example local unit test, which will execute on the development machine (host).
 | 
					 | 
				
			||||||
 *
 | 
					 | 
				
			||||||
 * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
public class ExampleUnitTest {
 | 
					 | 
				
			||||||
    @Test
 | 
					 | 
				
			||||||
    public void addition_isCorrect() {
 | 
					 | 
				
			||||||
        assertEquals(4, 2 + 2);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
							
								
								
									
										12
									
								
								build.gradle
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								build.gradle
									
									
									
									
									
								
							@ -2,10 +2,10 @@
 | 
				
			|||||||
buildscript {
 | 
					buildscript {
 | 
				
			||||||
    repositories {
 | 
					    repositories {
 | 
				
			||||||
        google()
 | 
					        google()
 | 
				
			||||||
        jcenter()
 | 
					        mavenCentral()
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    dependencies {
 | 
					    dependencies {
 | 
				
			||||||
        classpath 'com.android.tools.build:gradle:7.1.1'
 | 
					        classpath 'com.android.tools.build:gradle:8.9.3'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // NOTE: Do not place your application dependencies here; they belong
 | 
					        // NOTE: Do not place your application dependencies here; they belong
 | 
				
			||||||
        // in the individual module build.gradle files
 | 
					        // in the individual module build.gradle files
 | 
				
			||||||
@ -15,15 +15,17 @@ buildscript {
 | 
				
			|||||||
allprojects {
 | 
					allprojects {
 | 
				
			||||||
    repositories {
 | 
					    repositories {
 | 
				
			||||||
        google()
 | 
					        google()
 | 
				
			||||||
        jcenter()
 | 
					        mavenCentral()
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    gradle.projectsEvaluated {
 | 
					    gradle.projectsEvaluated {
 | 
				
			||||||
        tasks.withType(JavaCompile) {
 | 
					        tasks.withType(JavaCompile).tap {
 | 
				
			||||||
 | 
					            configureEach {
 | 
				
			||||||
                options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
 | 
					                options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
task clean(type: Delete) {
 | 
					tasks.register('clean', Delete) {
 | 
				
			||||||
    delete rootProject.buildDir
 | 
					    delete rootProject.buildDir
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@ -17,3 +17,6 @@ org.gradle.jvmargs=-Xmx2048m
 | 
				
			|||||||
android.useAndroidX=true
 | 
					android.useAndroidX=true
 | 
				
			||||||
# Automatically convert third-party libraries to use AndroidX
 | 
					# Automatically convert third-party libraries to use AndroidX
 | 
				
			||||||
android.enableJetifier=true
 | 
					android.enableJetifier=true
 | 
				
			||||||
 | 
					android.defaults.buildfeatures.buildconfig=true
 | 
				
			||||||
 | 
					android.nonTransitiveRClass=false
 | 
				
			||||||
 | 
					android.nonFinalResIds=false
 | 
				
			||||||
							
								
								
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 | 
				
			|||||||
distributionPath=wrapper/dists
 | 
					distributionPath=wrapper/dists
 | 
				
			||||||
zipStoreBase=GRADLE_USER_HOME
 | 
					zipStoreBase=GRADLE_USER_HOME
 | 
				
			||||||
zipStorePath=wrapper/dists
 | 
					zipStorePath=wrapper/dists
 | 
				
			||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
 | 
					distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user