diff --git a/.github/workflows/publish-android-lib.yml b/.github/workflows/publish-android-lib.yml index abd982b0..707acf4a 100644 --- a/.github/workflows/publish-android-lib.yml +++ b/.github/workflows/publish-android-lib.yml @@ -24,6 +24,7 @@ on: - io.github.sceneview--sceneview - com.shakebugs - com.facebook.android + - DriveSmart jobs: build-then-publish: environment: production @@ -46,6 +47,7 @@ jobs: java-version: '11' - name: Set MAPBOX_DOWNLOADS_TOKEN + if: ${{ inputs.LIB_FOLDER == 'com.mapbox.maps--android' }} run: | echo "MAPBOX_DOWNLOADS_TOKEN=$MAPBOX_DOWNLOADS_TOKEN" >> ~/.gradle/gradle.properties cat ~/.gradle/gradle.properties @@ -53,6 +55,17 @@ jobs: env: MAPBOX_DOWNLOADS_TOKEN : ${{secrets.MAPBOX_DOWNLOADS_TOKEN}} + - name: Set DriveSmart credentials + if: ${{ inputs.LIB_FOLDER == 'DriveSmart' }} + run: | + echo "tfsdrivesmart_user=$TFSDRIVESMART_USER" >> ~/.gradle/gradle.properties + echo "tfsdrivesmart_password=$TFSDRIVESMART_PASSWORD" >> ~/.gradle/gradle.properties + cat ~/.gradle/gradle.properties + shell: bash + env: + TFSDRIVESMART_USER: ${{secrets.TFSDRIVESMART_USER}} + TFSDRIVESMART_PASSWORD: ${{secrets.TFSDRIVESMART_PASSWORD}} + - name: Install android workload run: | dotnet workload install android diff --git a/dotnet-binding-utils.sln b/dotnet-binding-utils.sln index 606597f5..7e8d6bed 100644 --- a/dotnet-binding-utils.sln +++ b/dotnet-binding-utils.sln @@ -19,7 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "metadata", "metadata", "{11 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetBindings.Cake", "src\DotnetBindings.Cake\DotnetBindings.Cake.csproj", "{95670EEE-39E4-42C4-BF73-B28109EC962D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "qs\com.shakebugs\build\Build.csproj", "{A756BCEC-3358-4B56-9903-AC6DED4EF42B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "qs\DriveSmart\build\Build.csproj", "{876D7FCD-239F-4CA1-B244-1CA0C9B9C491}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -51,10 +51,10 @@ Global {95670EEE-39E4-42C4-BF73-B28109EC962D}.Debug|Any CPU.Build.0 = Debug|Any CPU {95670EEE-39E4-42C4-BF73-B28109EC962D}.Release|Any CPU.ActiveCfg = Release|Any CPU {95670EEE-39E4-42C4-BF73-B28109EC962D}.Release|Any CPU.Build.0 = Release|Any CPU - {A756BCEC-3358-4B56-9903-AC6DED4EF42B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A756BCEC-3358-4B56-9903-AC6DED4EF42B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A756BCEC-3358-4B56-9903-AC6DED4EF42B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A756BCEC-3358-4B56-9903-AC6DED4EF42B}.Release|Any CPU.Build.0 = Release|Any CPU + {876D7FCD-239F-4CA1-B244-1CA0C9B9C491}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {876D7FCD-239F-4CA1-B244-1CA0C9B9C491}.Debug|Any CPU.Build.0 = Debug|Any CPU + {876D7FCD-239F-4CA1-B244-1CA0C9B9C491}.Release|Any CPU.ActiveCfg = Release|Any CPU + {876D7FCD-239F-4CA1-B244-1CA0C9B9C491}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/metadata/android/android.arch.work/work-runtime-ktx/nuget.json b/metadata/android/android.arch.work/work-runtime-ktx/nuget.json new file mode 100644 index 00000000..c37201d9 --- /dev/null +++ b/metadata/android/android.arch.work/work-runtime-ktx/nuget.json @@ -0,0 +1 @@ +{"relocated":"androidx.work:work-runtime-ktx","versionMappings":[]} \ No newline at end of file diff --git a/metadata/android/androidx.collection/collection/1.4.0.json b/metadata/android/androidx.collection/collection/1.4.0.json index be5d9b1c..1f03f5fd 100644 --- a/metadata/android/androidx.collection/collection/1.4.0.json +++ b/metadata/android/androidx.collection/collection/1.4.0.json @@ -1 +1 @@ -{"revision":1} \ No newline at end of file +{"revision":2} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.0.0-preview01.json b/metadata/android/androidx.room/room-common/2.0.0-preview01.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.0.0-preview01.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.0.0-preview02.json b/metadata/android/androidx.room/room-common/2.0.0-preview02.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.0.0-preview02.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.0.0.json b/metadata/android/androidx.room/room-common/2.0.0.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.0.0.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.2.1-preview03.json b/metadata/android/androidx.room/room-common/2.2.1-preview03.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.2.1-preview03.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.2.1-preview06.json b/metadata/android/androidx.room/room-common/2.2.1-preview06.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.2.1-preview06.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.2.2-rc1.json b/metadata/android/androidx.room/room-common/2.2.2-rc1.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.2.2-rc1.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.2.2-rc3.json b/metadata/android/androidx.room/room-common/2.2.2-rc3.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.2.2-rc3.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.2.2.json b/metadata/android/androidx.room/room-common/2.2.2.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.2.2.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.2.4.json b/metadata/android/androidx.room/room-common/2.2.4.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.2.4.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.2.5.json b/metadata/android/androidx.room/room-common/2.2.5.json new file mode 100644 index 00000000..29b53a4d --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.2.5.json @@ -0,0 +1 @@ +{"revision":6} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.2.6.json b/metadata/android/androidx.room/room-common/2.2.6.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.2.6.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.3.0.json b/metadata/android/androidx.room/room-common/2.3.0.json new file mode 100644 index 00000000..29b53a4d --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.3.0.json @@ -0,0 +1 @@ +{"revision":6} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.4.1.json b/metadata/android/androidx.room/room-common/2.4.1.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.4.1.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.4.2.json b/metadata/android/androidx.room/room-common/2.4.2.json new file mode 100644 index 00000000..1f03f5fd --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.4.2.json @@ -0,0 +1 @@ +{"revision":2} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.4.3.json b/metadata/android/androidx.room/room-common/2.4.3.json new file mode 100644 index 00000000..1f03f5fd --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.4.3.json @@ -0,0 +1 @@ +{"revision":2} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.5.0.json b/metadata/android/androidx.room/room-common/2.5.0.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.5.0.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.5.1.json b/metadata/android/androidx.room/room-common/2.5.1.json new file mode 100644 index 00000000..1f03f5fd --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.5.1.json @@ -0,0 +1 @@ +{"revision":2} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.5.2.json b/metadata/android/androidx.room/room-common/2.5.2.json new file mode 100644 index 00000000..e046c118 --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.5.2.json @@ -0,0 +1 @@ +{"revision":3} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.6.0.json b/metadata/android/androidx.room/room-common/2.6.0.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.6.0.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/2.6.1.json b/metadata/android/androidx.room/room-common/2.6.1.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/androidx.room/room-common/2.6.1.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-common/nuget.json b/metadata/android/androidx.room/room-common/nuget.json new file mode 100644 index 00000000..e1b47fac --- /dev/null +++ b/metadata/android/androidx.room/room-common/nuget.json @@ -0,0 +1 @@ +{"packageId":"Xamarin.AndroidX.Room.Common","versionMappings":[]} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-ktx/2.3.0.json b/metadata/android/androidx.room/room-ktx/2.3.0.json new file mode 100644 index 00000000..29b53a4d --- /dev/null +++ b/metadata/android/androidx.room/room-ktx/2.3.0.json @@ -0,0 +1 @@ +{"revision":6} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-ktx/2.4.1.json b/metadata/android/androidx.room/room-ktx/2.4.1.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/androidx.room/room-ktx/2.4.1.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-ktx/2.4.2.json b/metadata/android/androidx.room/room-ktx/2.4.2.json new file mode 100644 index 00000000..e046c118 --- /dev/null +++ b/metadata/android/androidx.room/room-ktx/2.4.2.json @@ -0,0 +1 @@ +{"revision":3} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-ktx/2.4.3.json b/metadata/android/androidx.room/room-ktx/2.4.3.json new file mode 100644 index 00000000..1f03f5fd --- /dev/null +++ b/metadata/android/androidx.room/room-ktx/2.4.3.json @@ -0,0 +1 @@ +{"revision":2} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-ktx/2.5.0.json b/metadata/android/androidx.room/room-ktx/2.5.0.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/androidx.room/room-ktx/2.5.0.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-ktx/2.5.1.json b/metadata/android/androidx.room/room-ktx/2.5.1.json new file mode 100644 index 00000000..1f03f5fd --- /dev/null +++ b/metadata/android/androidx.room/room-ktx/2.5.1.json @@ -0,0 +1 @@ +{"revision":2} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-ktx/2.5.2.json b/metadata/android/androidx.room/room-ktx/2.5.2.json new file mode 100644 index 00000000..e046c118 --- /dev/null +++ b/metadata/android/androidx.room/room-ktx/2.5.2.json @@ -0,0 +1 @@ +{"revision":3} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-ktx/2.6.0.json b/metadata/android/androidx.room/room-ktx/2.6.0.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/androidx.room/room-ktx/2.6.0.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-ktx/2.6.1.json b/metadata/android/androidx.room/room-ktx/2.6.1.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/androidx.room/room-ktx/2.6.1.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/androidx.room/room-ktx/nuget.json b/metadata/android/androidx.room/room-ktx/nuget.json new file mode 100644 index 00000000..4fb127da --- /dev/null +++ b/metadata/android/androidx.room/room-ktx/nuget.json @@ -0,0 +1 @@ +{"packageId":"Xamarin.AndroidX.Room.Room.Ktx","versionMappings":[]} \ No newline at end of file diff --git a/metadata/android/androidx.work/work-runtime-ktx/1.0.1.json b/metadata/android/androidx.work/work-runtime-ktx/1.0.1.json new file mode 100644 index 00000000..3a927ae0 --- /dev/null +++ b/metadata/android/androidx.work/work-runtime-ktx/1.0.1.json @@ -0,0 +1 @@ +{"fallbackVersion": "2.0.1"} \ No newline at end of file diff --git a/metadata/android/dev.romainguy/kotlin-math/1.5.3.json b/metadata/android/dev.romainguy/kotlin-math/1.5.3.json index be5d9b1c..1f03f5fd 100644 --- a/metadata/android/dev.romainguy/kotlin-math/1.5.3.json +++ b/metadata/android/dev.romainguy/kotlin-math/1.5.3.json @@ -1 +1 @@ -{"revision":1} \ No newline at end of file +{"revision":2} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.3.50.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.3.50.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.3.50.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.3.61.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.3.61.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.3.61.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.3.72.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.3.72.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.3.72.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.0.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.0.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.0.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.10.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.10.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.10.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.20.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.20.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.20.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.21.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.21.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.21.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.30.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.30.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.30.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.31.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.31.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.31.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.32.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.32.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.4.32.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.5.0.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.5.0.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.5.0.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.5.10.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.5.10.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.5.10.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.5.20.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.5.20.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.5.20.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.5.21.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.5.21.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.5.21.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.5.30.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.5.30.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.5.30.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.5.31.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.5.31.json new file mode 100644 index 00000000..87549859 --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.5.31.json @@ -0,0 +1 @@ +{"revision":4} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.6.0.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.6.0.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.6.0.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.6.10.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.6.10.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.6.10.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.6.20.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.6.20.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.6.20.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.6.21.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.6.21.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.6.21.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.7.0.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.7.0.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.7.0.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.7.10.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.7.10.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.7.10.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.7.20.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.7.20.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.7.20.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.7.21.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.7.21.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.7.21.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.7.22.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.7.22.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.7.22.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.8.0.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.8.0.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.8.0.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.8.10.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.8.10.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.8.10.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.8.20.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.8.20.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.8.20.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.8.21.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.8.21.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.8.21.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.8.22.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.8.22.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.8.22.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.9.0.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.9.0.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.9.0.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.9.10.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.9.10.json new file mode 100644 index 00000000..1f03f5fd --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.9.10.json @@ -0,0 +1 @@ +{"revision":2} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.9.20.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.9.20.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.9.20.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.9.21.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.9.21.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.9.21.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.9.22.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.9.22.json new file mode 100644 index 00000000..be5d9b1c --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.9.22.json @@ -0,0 +1 @@ +{"revision":1} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.9.23.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.9.23.json new file mode 100644 index 00000000..0364c1fd --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/1.9.23.json @@ -0,0 +1 @@ +{"revision":0} \ No newline at end of file diff --git a/metadata/android/org.jetbrains.kotlin/kotlin-reflect/nuget.json b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/nuget.json new file mode 100644 index 00000000..b8f9e434 --- /dev/null +++ b/metadata/android/org.jetbrains.kotlin/kotlin-reflect/nuget.json @@ -0,0 +1 @@ +{"packageId":"Xamarin.Kotlin.Reflect","versionMappings":[]} \ No newline at end of file diff --git a/qs/DriveSmart/LICENSE b/qs/DriveSmart/LICENSE new file mode 100644 index 00000000..c97146df --- /dev/null +++ b/qs/DriveSmart/LICENSE @@ -0,0 +1,17 @@ +**tuyen-vuduc is not responsible for, nor does it grant any licenses to, third-party packages. Some packages may require or install dependencies which are governed by additional licenses.** + +Note: This component depends on DriveSmart libraries, which is subject to their own licenses. + +**The 3-Clause BSD License** + +Copyright 2024 tuyen-vuduc + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/qs/DriveSmart/README.md b/qs/DriveSmart/README.md new file mode 100644 index 00000000..a3f98bdf --- /dev/null +++ b/qs/DriveSmart/README.md @@ -0,0 +1,57 @@ +# Build the library + +``` +sh build.sh --base-path $PWD +``` + +# Home page + +https://github.com/DriveSmart-MobileTeam/dstracker_integration_sample + +# Additional setup + +## OPTION 1: Everything in CSPROJ file +1/ Change your CSPROJ file to have Gradle configuration +``` + + + + maven { + url 'https://tfsdrivesmart.pkgs.visualstudio.com/5243836b-8777-4cb6-aded-44ab518bc748/_packaging/Android_Libraries/maven/v1' + name 'Android_Libraries' + credentials { + username 'YOUR_USER_NAME' + password 'YOUR_PASSWORD' + } + } + + + +``` + +**NOTE**: Please consider using PROPS file to not commit your credentials into the VCS. + +## OPTION 2: Use ~/.gradle/gradle.properties file +1/ Change your CSPROJ file to have Gradle configuration +``` + + + + maven { + url 'https://tfsdrivesmart.pkgs.visualstudio.com/5243836b-8777-4cb6-aded-44ab518bc748/_packaging/Android_Libraries/maven/v1' + name 'Android_Libraries' + credentials { + username tfsdrivesmart_user + password tfsdrivesmart_password + } + } + + + +``` + +2/ Set your username and password in gradle.properties file +``` +tfsdrivesmart_user=YOUR_USERNAME +tfsdrivesmart_password=YOUR_PASSWORD +``` \ No newline at end of file diff --git a/qs/DriveSmart/assets/tv-drivesmart.png b/qs/DriveSmart/assets/tv-drivesmart.png new file mode 100644 index 00000000..5c459c91 Binary files /dev/null and b/qs/DriveSmart/assets/tv-drivesmart.png differ diff --git a/qs/DriveSmart/build.ps1 b/qs/DriveSmart/build.ps1 new file mode 100644 index 00000000..a7077190 --- /dev/null +++ b/qs/DriveSmart/build.ps1 @@ -0,0 +1,2 @@ +dotnet run --project build/Build.csproj -- $args +exit $LASTEXITCODE; \ No newline at end of file diff --git a/qs/DriveSmart/build.sh b/qs/DriveSmart/build.sh new file mode 100644 index 00000000..dfd6b854 --- /dev/null +++ b/qs/DriveSmart/build.sh @@ -0,0 +1 @@ +dotnet run --project ./build/Build.csproj -- "$@" diff --git a/qs/DriveSmart/build/.gitignore b/qs/DriveSmart/build/.gitignore new file mode 100644 index 00000000..9862f6cc --- /dev/null +++ b/qs/DriveSmart/build/.gitignore @@ -0,0 +1,2 @@ +binding-default.zip +Properties/launchSettings.json \ No newline at end of file diff --git a/qs/DriveSmart/build/Build.csproj b/qs/DriveSmart/build/Build.csproj new file mode 100644 index 00000000..63ef9b07 --- /dev/null +++ b/qs/DriveSmart/build/Build.csproj @@ -0,0 +1,37 @@ + + + Exe + net7.0 + $(MSBuildProjectDirectory) + false + true + + + $(Home)/Library/Android/sdk + $(UserProfile)/AppData/Local/Android/sdk + + + + + + + + + + maven { + url 'https://tfsdrivesmart.pkgs.visualstudio.com/5243836b-8777-4cb6-aded-44ab518bc748/_packaging/Android_Libraries/maven/v1' + name 'Android_Libraries' + credentials { + username tfsdrivesmart_user + password tfsdrivesmart_password + } + } + + + + + + + + + \ No newline at end of file diff --git a/qs/DriveSmart/build/Program.cs b/qs/DriveSmart/build/Program.cs new file mode 100644 index 00000000..e366ccf2 --- /dev/null +++ b/qs/DriveSmart/build/Program.cs @@ -0,0 +1,16 @@ +public static class Program +{ + public static int Main(string[] args) + { + return new CakeHost() + .AddAssembly(typeof(BuildContext).Assembly) + .UseContext() + .Run(args); + } +} + +[TaskName("Default")] +[IsDependentOn(typeof(NugetTask))] +public class DefaultTask : FrostingTask +{ +} \ No newline at end of file diff --git a/qs/DriveSmart/build/Usings.cs b/qs/DriveSmart/build/Usings.cs new file mode 100644 index 00000000..c949d0f6 --- /dev/null +++ b/qs/DriveSmart/build/Usings.cs @@ -0,0 +1,25 @@ +global using System; +global using System.Collections.Generic; +global using System.IO; +global using System.Linq; +global using System.Threading.Tasks; +global using System.Text.Json; + +global using PathIO = System.IO.Path; + +global using Cake.Common; +global using Cake.Common.IO; +global using Cake.Common.Tools.DotNet; +global using Cake.Common.Tools.DotNet.Pack; + +global using Cake.Core; +global using Cake.Core.Diagnostics; +global using Cake.Core.IO; +global using PathCake = Cake.Core.IO.Path; + +global using Cake.Frosting; + +global using Binderator.Gradle; +global using Xamarin.Build.Download; + +global using DotnetBindings.Cake; \ No newline at end of file diff --git a/qs/DriveSmart/config.json b/qs/DriveSmart/config.json new file mode 100644 index 00000000..938a7943 --- /dev/null +++ b/qs/DriveSmart/config.json @@ -0,0 +1,40 @@ +{ + "solutionFile" : "generated/drivesmart-bindings.sln", + "metadataPath": "../..", + "debug": { "dumpModels" : true }, + "additionalProjects": [ + ], + "targetFrameworks": [ + "MonoAndroid12.0", + "net6.0-android31.0", + "net7.0-android33.0" + ], + "projectUrl": "https://github.com/tuyen-vuduc/dotnet-binding-utils", + "packageIconPath": "../../assets/tv-drivesmart.png", + "licensePath": "../../LICENSE", + "tags": [ "android" ], + "templates" : [ + { + "templateFile": "../../src/Targets.cshtml", + "outputFileRule" : "generated/{nugetid}/{nugetid}.targets" + }, + { + "templateFile": "../../src/Project.cshtml", + "outputFileRule" : "generated/{nugetid}/{nugetid}.csproj" + }, + { + "templateFile": "../../src/Pom.cshtml", + "outputFileRule" : "generated/{nugetid}/pom.xml" + } + ], + "groupName": "DriveSmart", + "artifacts": [ + { + "groupId": "DriveSmart", + "artifactId": "DS-Tracker", + "version": "1.2.1", + "nugetRevision": 3, + "tags": [] + } + ] +} \ No newline at end of file diff --git a/qs/DriveSmart/source/DriveSmart/DS-Core/Additions/AboutAdditions.txt b/qs/DriveSmart/source/DriveSmart/DS-Core/Additions/AboutAdditions.txt new file mode 100644 index 00000000..e7b77657 --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Core/Additions/AboutAdditions.txt @@ -0,0 +1,48 @@ +Additions allow you to add arbitrary C# to the generated classes +before they are compiled. This can be helpful for providing convenience +methods or adding pure C# classes. + +== Adding Methods to Generated Classes == + +Let's say the library being bound has a Rectangle class with a constructor +that takes an x and y position, and a width and length size. It will look like +this: + +public partial class Rectangle +{ + public Rectangle (int x, int y, int width, int height) + { + // JNI bindings + } +} + +Imagine we want to add a constructor to this class that takes a Point and +Size structure instead of 4 ints. We can add a new file called Rectangle.cs +with a partial class containing our new method: + +public partial class Rectangle +{ + public Rectangle (Point location, Size size) : + this (location.X, location.Y, size.Width, size.Height) + { + } +} + +At compile time, the additions class will be added to the generated class +and the final assembly will a Rectangle class with both constructors. + + +== Adding C# Classes == + +Another thing that can be done is adding fully C# managed classes to the +generated library. In the above example, let's assume that there isn't a +Point class available in Java or our library. The one we create doesn't need +to interact with Java, so we'll create it like a normal class in C#. + +By adding a Point.cs file with this class, it will end up in the binding library: + +public class Point +{ + public int X { get; set; } + public int Y { get; set; } +} diff --git a/qs/DriveSmart/source/DriveSmart/DS-Core/Additions/Additions.cs b/qs/DriveSmart/source/DriveSmart/DS-Core/Additions/Additions.cs new file mode 100644 index 00000000..5cc05613 --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Core/Additions/Additions.cs @@ -0,0 +1,106 @@ +using System; +using System.Collections.Generic; +using Android.Runtime; +using Java.Interop; + +namespace Com.Drivesmart.Dscore.Utils.Wrappers +{ + partial class ListMapperImpl + { + Java.Lang.Object? global::Com.Drivesmart.Dscore.Interfaces.Wrapper.IMapper.Map(Java.Lang.Object? input) + { + IntPtr native_input = JNIEnv.ToLocalJniHandle(input); + + try + { + var xinput = Android.Runtime.JavaList.FromJniHandle(native_input, JniHandleOwnership.TransferLocalRef); + return (Java.Lang.Object?)Map(xinput); + } + finally + { + JNIEnv.DeleteLocalRef(native_input); + } + } + + Java.Lang.Object? global::Com.Drivesmart.Dscore.Interfaces.Wrapper.IMapper.MapInvert(Java.Lang.Object? input) + { + IntPtr native_input = JNIEnv.ToLocalJniHandle(input); + + try + { + var xinput = Android.Runtime.JavaList.FromJniHandle(native_input, JniHandleOwnership.TransferLocalRef); + return (Java.Lang.Object?)MapInvert(xinput); + } + finally + { + JNIEnv.DeleteLocalRef(native_input); + } + } + } + + partial class NullableInputListMapperImpl + { + Java.Lang.Object? global::Com.Drivesmart.Dscore.Interfaces.Wrapper.IMapper.Map(Java.Lang.Object? input) + { + IntPtr native_input = JNIEnv.ToLocalJniHandle(input); + + try + { + var xinput = Android.Runtime.JavaList.FromJniHandle(native_input, JniHandleOwnership.TransferLocalRef); + return (Java.Lang.Object?)Map(xinput); + } + finally + { + JNIEnv.DeleteLocalRef(native_input); + } + } + + Java.Lang.Object? global::Com.Drivesmart.Dscore.Interfaces.Wrapper.IMapper.MapInvert(Java.Lang.Object? input) + { + IntPtr native_input = JNIEnv.ToLocalJniHandle(input); + + try + { + var xinput = Android.Runtime.JavaList.FromJniHandle(native_input, JniHandleOwnership.TransferLocalRef); + return (Java.Lang.Object?)MapInvert(xinput); + } + finally + { + JNIEnv.DeleteLocalRef(native_input); + } + } + } + + partial class NullableOutputListMapperImpl + { + Java.Lang.Object? global::Com.Drivesmart.Dscore.Interfaces.Wrapper.IMapper.Map(Java.Lang.Object? input) + { + IntPtr native_input = JNIEnv.ToLocalJniHandle(input); + + try + { + var xinput = Android.Runtime.JavaList.FromJniHandle(native_input, JniHandleOwnership.TransferLocalRef); + return (Java.Lang.Object?)Map(xinput); + } + finally + { + JNIEnv.DeleteLocalRef(native_input); + } + } + + Java.Lang.Object? global::Com.Drivesmart.Dscore.Interfaces.Wrapper.IMapper.MapInvert(Java.Lang.Object? input) + { + IntPtr native_input = JNIEnv.ToLocalJniHandle(input); + + try + { + var xinput = Android.Runtime.JavaList.FromJniHandle(native_input, JniHandleOwnership.TransferLocalRef); + return (Java.Lang.Object?)MapInvert(xinput); + } + finally + { + JNIEnv.DeleteLocalRef(native_input); + } + } + } +} \ No newline at end of file diff --git a/qs/DriveSmart/source/DriveSmart/DS-Core/Transforms/EnumFields.xml b/qs/DriveSmart/source/DriveSmart/DS-Core/Transforms/EnumFields.xml new file mode 100644 index 00000000..68cc7fd6 --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Core/Transforms/EnumFields.xml @@ -0,0 +1,19 @@ + + + + diff --git a/qs/DriveSmart/source/DriveSmart/DS-Core/Transforms/EnumMethods.xml b/qs/DriveSmart/source/DriveSmart/DS-Core/Transforms/EnumMethods.xml new file mode 100644 index 00000000..bd77573a --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Core/Transforms/EnumMethods.xml @@ -0,0 +1,19 @@ + + + + diff --git a/qs/DriveSmart/source/DriveSmart/DS-Core/Transforms/Metadata.xml b/qs/DriveSmart/source/DriveSmart/DS-Core/Transforms/Metadata.xml new file mode 100644 index 00000000..3777a55b --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Core/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + diff --git a/qs/DriveSmart/source/DriveSmart/DS-Networking/Additions/AboutAdditions.txt b/qs/DriveSmart/source/DriveSmart/DS-Networking/Additions/AboutAdditions.txt new file mode 100644 index 00000000..e7b77657 --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Networking/Additions/AboutAdditions.txt @@ -0,0 +1,48 @@ +Additions allow you to add arbitrary C# to the generated classes +before they are compiled. This can be helpful for providing convenience +methods or adding pure C# classes. + +== Adding Methods to Generated Classes == + +Let's say the library being bound has a Rectangle class with a constructor +that takes an x and y position, and a width and length size. It will look like +this: + +public partial class Rectangle +{ + public Rectangle (int x, int y, int width, int height) + { + // JNI bindings + } +} + +Imagine we want to add a constructor to this class that takes a Point and +Size structure instead of 4 ints. We can add a new file called Rectangle.cs +with a partial class containing our new method: + +public partial class Rectangle +{ + public Rectangle (Point location, Size size) : + this (location.X, location.Y, size.Width, size.Height) + { + } +} + +At compile time, the additions class will be added to the generated class +and the final assembly will a Rectangle class with both constructors. + + +== Adding C# Classes == + +Another thing that can be done is adding fully C# managed classes to the +generated library. In the above example, let's assume that there isn't a +Point class available in Java or our library. The one we create doesn't need +to interact with Java, so we'll create it like a normal class in C#. + +By adding a Point.cs file with this class, it will end up in the binding library: + +public class Point +{ + public int X { get; set; } + public int Y { get; set; } +} diff --git a/qs/DriveSmart/source/DriveSmart/DS-Networking/Additions/Additions.cs b/qs/DriveSmart/source/DriveSmart/DS-Networking/Additions/Additions.cs new file mode 100644 index 00000000..bc62d949 --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Networking/Additions/Additions.cs @@ -0,0 +1,10 @@ + +namespace Com.Drivesmart.Dsnetworking.Utils { + partial class DoAsyncVoid + { + protected override Java.Lang.Object? DoInBackground(params Java.Lang.Object[]? @params) + { + return DoInBackground(@params.Cast().ToArray()); + } + } +} \ No newline at end of file diff --git a/qs/DriveSmart/source/DriveSmart/DS-Networking/Transforms/EnumFields.xml b/qs/DriveSmart/source/DriveSmart/DS-Networking/Transforms/EnumFields.xml new file mode 100644 index 00000000..68cc7fd6 --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Networking/Transforms/EnumFields.xml @@ -0,0 +1,19 @@ + + + + diff --git a/qs/DriveSmart/source/DriveSmart/DS-Networking/Transforms/EnumMethods.xml b/qs/DriveSmart/source/DriveSmart/DS-Networking/Transforms/EnumMethods.xml new file mode 100644 index 00000000..bd77573a --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Networking/Transforms/EnumMethods.xml @@ -0,0 +1,19 @@ + + + + diff --git a/qs/DriveSmart/source/DriveSmart/DS-Networking/Transforms/Metadata.xml b/qs/DriveSmart/source/DriveSmart/DS-Networking/Transforms/Metadata.xml new file mode 100644 index 00000000..3777a55b --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Networking/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + diff --git a/qs/DriveSmart/source/DriveSmart/DS-Room/Additions/AboutAdditions.txt b/qs/DriveSmart/source/DriveSmart/DS-Room/Additions/AboutAdditions.txt new file mode 100644 index 00000000..e7b77657 --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Room/Additions/AboutAdditions.txt @@ -0,0 +1,48 @@ +Additions allow you to add arbitrary C# to the generated classes +before they are compiled. This can be helpful for providing convenience +methods or adding pure C# classes. + +== Adding Methods to Generated Classes == + +Let's say the library being bound has a Rectangle class with a constructor +that takes an x and y position, and a width and length size. It will look like +this: + +public partial class Rectangle +{ + public Rectangle (int x, int y, int width, int height) + { + // JNI bindings + } +} + +Imagine we want to add a constructor to this class that takes a Point and +Size structure instead of 4 ints. We can add a new file called Rectangle.cs +with a partial class containing our new method: + +public partial class Rectangle +{ + public Rectangle (Point location, Size size) : + this (location.X, location.Y, size.Width, size.Height) + { + } +} + +At compile time, the additions class will be added to the generated class +and the final assembly will a Rectangle class with both constructors. + + +== Adding C# Classes == + +Another thing that can be done is adding fully C# managed classes to the +generated library. In the above example, let's assume that there isn't a +Point class available in Java or our library. The one we create doesn't need +to interact with Java, so we'll create it like a normal class in C#. + +By adding a Point.cs file with this class, it will end up in the binding library: + +public class Point +{ + public int X { get; set; } + public int Y { get; set; } +} diff --git a/qs/DriveSmart/source/DriveSmart/DS-Room/Additions/Additions.cs b/qs/DriveSmart/source/DriveSmart/DS-Room/Additions/Additions.cs new file mode 100644 index 00000000..8f4ec81a --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Room/Additions/Additions.cs @@ -0,0 +1,14 @@ + +using Com.Example.Dsroom.Dao; + +namespace Com.Example.Dsroom.Repository +{ + partial class DeviceRepository + { + protected override IBaseDao BaseDao => Dao; + } + partial class UserRepository + { + protected override IBaseDao BaseDao => Dao; + } +} \ No newline at end of file diff --git a/qs/DriveSmart/source/DriveSmart/DS-Room/Transforms/EnumFields.xml b/qs/DriveSmart/source/DriveSmart/DS-Room/Transforms/EnumFields.xml new file mode 100644 index 00000000..68cc7fd6 --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Room/Transforms/EnumFields.xml @@ -0,0 +1,19 @@ + + + + diff --git a/qs/DriveSmart/source/DriveSmart/DS-Room/Transforms/EnumMethods.xml b/qs/DriveSmart/source/DriveSmart/DS-Room/Transforms/EnumMethods.xml new file mode 100644 index 00000000..bd77573a --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Room/Transforms/EnumMethods.xml @@ -0,0 +1,19 @@ + + + + diff --git a/qs/DriveSmart/source/DriveSmart/DS-Room/Transforms/Metadata.xml b/qs/DriveSmart/source/DriveSmart/DS-Room/Transforms/Metadata.xml new file mode 100644 index 00000000..5bcb4823 --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Room/Transforms/Metadata.xml @@ -0,0 +1,5 @@ + + + BaseDao + diff --git a/qs/DriveSmart/source/DriveSmart/DS-Tracker/Additions/AboutAdditions.txt b/qs/DriveSmart/source/DriveSmart/DS-Tracker/Additions/AboutAdditions.txt new file mode 100644 index 00000000..e7b77657 --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Tracker/Additions/AboutAdditions.txt @@ -0,0 +1,48 @@ +Additions allow you to add arbitrary C# to the generated classes +before they are compiled. This can be helpful for providing convenience +methods or adding pure C# classes. + +== Adding Methods to Generated Classes == + +Let's say the library being bound has a Rectangle class with a constructor +that takes an x and y position, and a width and length size. It will look like +this: + +public partial class Rectangle +{ + public Rectangle (int x, int y, int width, int height) + { + // JNI bindings + } +} + +Imagine we want to add a constructor to this class that takes a Point and +Size structure instead of 4 ints. We can add a new file called Rectangle.cs +with a partial class containing our new method: + +public partial class Rectangle +{ + public Rectangle (Point location, Size size) : + this (location.X, location.Y, size.Width, size.Height) + { + } +} + +At compile time, the additions class will be added to the generated class +and the final assembly will a Rectangle class with both constructors. + + +== Adding C# Classes == + +Another thing that can be done is adding fully C# managed classes to the +generated library. In the above example, let's assume that there isn't a +Point class available in Java or our library. The one we create doesn't need +to interact with Java, so we'll create it like a normal class in C#. + +By adding a Point.cs file with this class, it will end up in the binding library: + +public class Point +{ + public int X { get; set; } + public int Y { get; set; } +} diff --git a/qs/DriveSmart/source/DriveSmart/DS-Tracker/Additions/Additions.cs b/qs/DriveSmart/source/DriveSmart/DS-Tracker/Additions/Additions.cs new file mode 100644 index 00000000..4f45a693 --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Tracker/Additions/Additions.cs @@ -0,0 +1,66 @@ +namespace Com.Dstracker.Utils +{ + partial class DoAsyncVoid + { + protected override Java.Lang.Object? DoInBackground(params Java.Lang.Object[]? @params) + { + return DoInBackground(@params.Cast().ToArray()); + } + } +} + +namespace Com.Dstracker { + partial class EventEntry : global::Android.Provider.IBaseColumns { } +} + +namespace Com.Dstracker.Singleton +{ + using System; + using Com.Dstracker.Enums; + using Kotlin.Jvm.Functions; + + partial class Tracker + { + public void GetOrAddUserIdBy(string userId, Action action) + { + var func1 = new Function1Action(action); + this.GetOrAddUserIdBy(userId, func1); + } + public void Configure(string userId, Action action) + { + var func1 = new Function1Action(action); + this.SetUserId(userId, func1); + } + public void SetUserId(string userId, Action action) + { + var func1 = new Function1Action(action); + this.SetUserId(userId, func1); + } + public void Start(string withMetaData, Action action) + { + var func1 = new Function1Action(action); + this.Start(withMetaData, func1); + } + public void Stop(string userId, Action action) + { + var func1 = new Function1Action(action); + this.Stop(func1); + } + } + + public class Function1Action : Java.Lang.Object, IFunction1 + { + private readonly Action action; + + public Function1Action(Action action) + { + this.action = action; + } + + public Java.Lang.Object? Invoke(Java.Lang.Object? p0) + { + action?.Invoke((T)(object)p0); + return null; + } + } +} \ No newline at end of file diff --git a/qs/DriveSmart/source/DriveSmart/DS-Tracker/Transforms/EnumFields.xml b/qs/DriveSmart/source/DriveSmart/DS-Tracker/Transforms/EnumFields.xml new file mode 100644 index 00000000..68cc7fd6 --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Tracker/Transforms/EnumFields.xml @@ -0,0 +1,19 @@ + + + + diff --git a/qs/DriveSmart/source/DriveSmart/DS-Tracker/Transforms/EnumMethods.xml b/qs/DriveSmart/source/DriveSmart/DS-Tracker/Transforms/EnumMethods.xml new file mode 100644 index 00000000..bd77573a --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Tracker/Transforms/EnumMethods.xml @@ -0,0 +1,19 @@ + + + + diff --git a/qs/DriveSmart/source/DriveSmart/DS-Tracker/Transforms/Metadata.xml b/qs/DriveSmart/source/DriveSmart/DS-Tracker/Transforms/Metadata.xml new file mode 100644 index 00000000..1f342343 --- /dev/null +++ b/qs/DriveSmart/source/DriveSmart/DS-Tracker/Transforms/Metadata.xml @@ -0,0 +1,4 @@ + + + + diff --git a/qs/androidx.health.connect--connect-client/build/Build.csproj b/qs/androidx.health.connect--connect-client/build/Build.csproj index de60486c..1702ca24 100644 --- a/qs/androidx.health.connect--connect-client/build/Build.csproj +++ b/qs/androidx.health.connect--connect-client/build/Build.csproj @@ -16,7 +16,7 @@ - + diff --git a/qs/androidx.lifecycle/build/Build.csproj b/qs/androidx.lifecycle/build/Build.csproj index 913dc2fa..49f283f7 100644 --- a/qs/androidx.lifecycle/build/Build.csproj +++ b/qs/androidx.lifecycle/build/Build.csproj @@ -12,7 +12,7 @@ - + diff --git a/qs/com.braintreepayments.api--drop-in/build/Build.csproj b/qs/com.braintreepayments.api--drop-in/build/Build.csproj index 1ddf6ee1..97b8cd08 100644 --- a/qs/com.braintreepayments.api--drop-in/build/Build.csproj +++ b/qs/com.braintreepayments.api--drop-in/build/Build.csproj @@ -15,7 +15,7 @@ - + diff --git a/qs/com.facebook.android/build/Build.csproj b/qs/com.facebook.android/build/Build.csproj index 210fb20f..15f4eb06 100644 --- a/qs/com.facebook.android/build/Build.csproj +++ b/qs/com.facebook.android/build/Build.csproj @@ -12,7 +12,7 @@ - + diff --git a/qs/com.github.kittinunf.fuel/build/Build.csproj b/qs/com.github.kittinunf.fuel/build/Build.csproj index c82d996c..723459e4 100644 --- a/qs/com.github.kittinunf.fuel/build/Build.csproj +++ b/qs/com.github.kittinunf.fuel/build/Build.csproj @@ -12,7 +12,7 @@ - + diff --git a/qs/com.github.kittinunf.result/build/Build.csproj b/qs/com.github.kittinunf.result/build/Build.csproj index 657e46b7..ea4fa0ad 100644 --- a/qs/com.github.kittinunf.result/build/Build.csproj +++ b/qs/com.github.kittinunf.result/build/Build.csproj @@ -12,7 +12,7 @@ - + diff --git a/qs/com.github.nguyenhoanglam--imagepicker/build/Build.csproj b/qs/com.github.nguyenhoanglam--imagepicker/build/Build.csproj index b64c0820..0ff2e7ea 100644 --- a/qs/com.github.nguyenhoanglam--imagepicker/build/Build.csproj +++ b/qs/com.github.nguyenhoanglam--imagepicker/build/Build.csproj @@ -12,7 +12,7 @@ - + diff --git a/qs/com.google.android.filament/build/Build.csproj b/qs/com.google.android.filament/build/Build.csproj index 6c5cbdda..601b8ad5 100644 --- a/qs/com.google.android.filament/build/Build.csproj +++ b/qs/com.google.android.filament/build/Build.csproj @@ -12,7 +12,7 @@ - + diff --git a/qs/com.google.ar--core/build/Build.csproj b/qs/com.google.ar--core/build/Build.csproj index d9fd5bb6..9f4a638e 100644 --- a/qs/com.google.ar--core/build/Build.csproj +++ b/qs/com.google.ar--core/build/Build.csproj @@ -17,7 +17,7 @@ - + diff --git a/qs/com.intellimec.mobile.android--tripdetectionumbrella/build/Build.csproj b/qs/com.intellimec.mobile.android--tripdetectionumbrella/build/Build.csproj index 19c2bbb4..0fb989c8 100644 --- a/qs/com.intellimec.mobile.android--tripdetectionumbrella/build/Build.csproj +++ b/qs/com.intellimec.mobile.android--tripdetectionumbrella/build/Build.csproj @@ -17,7 +17,7 @@ - + diff --git a/qs/com.izettle.payments--android-sdk-ui/build/Build.csproj b/qs/com.izettle.payments--android-sdk-ui/build/Build.csproj index d777de07..be3bd6dc 100644 --- a/qs/com.izettle.payments--android-sdk-ui/build/Build.csproj +++ b/qs/com.izettle.payments--android-sdk-ui/build/Build.csproj @@ -15,7 +15,7 @@ - + diff --git a/qs/com.mapbox.maps--android/build/Build.csproj b/qs/com.mapbox.maps--android/build/Build.csproj index fa247b43..5170216e 100644 --- a/qs/com.mapbox.maps--android/build/Build.csproj +++ b/qs/com.mapbox.maps--android/build/Build.csproj @@ -15,7 +15,7 @@ - + diff --git a/qs/com.shakebugs/build/Build.csproj b/qs/com.shakebugs/build/Build.csproj index 518f2cc1..18c1c125 100644 --- a/qs/com.shakebugs/build/Build.csproj +++ b/qs/com.shakebugs/build/Build.csproj @@ -12,7 +12,7 @@ - + diff --git a/qs/com.stripe--stripe-android/build/Build.csproj b/qs/com.stripe--stripe-android/build/Build.csproj index 28e1dba8..564144e6 100644 --- a/qs/com.stripe--stripe-android/build/Build.csproj +++ b/qs/com.stripe--stripe-android/build/Build.csproj @@ -15,7 +15,7 @@ - + diff --git a/qs/com.zettle.sdk.feature.qrc--paypal-ui/build/Build.csproj b/qs/com.zettle.sdk.feature.qrc--paypal-ui/build/Build.csproj index f3238d39..b0d28408 100644 --- a/qs/com.zettle.sdk.feature.qrc--paypal-ui/build/Build.csproj +++ b/qs/com.zettle.sdk.feature.qrc--paypal-ui/build/Build.csproj @@ -15,7 +15,7 @@ - + diff --git a/qs/dev.romainguy--kotlin-math/build/Build.csproj b/qs/dev.romainguy--kotlin-math/build/Build.csproj index cb9d4ac4..a561e816 100644 --- a/qs/dev.romainguy--kotlin-math/build/Build.csproj +++ b/qs/dev.romainguy--kotlin-math/build/Build.csproj @@ -12,7 +12,7 @@ - + diff --git a/qs/io.github.sceneview--sceneview/build/Build.csproj b/qs/io.github.sceneview--sceneview/build/Build.csproj index c88f8479..6470a314 100644 --- a/qs/io.github.sceneview--sceneview/build/Build.csproj +++ b/qs/io.github.sceneview--sceneview/build/Build.csproj @@ -16,7 +16,7 @@ - + diff --git a/qs/org.jetbrains.kotlin/build/Build.csproj b/qs/org.jetbrains.kotlin/build/Build.csproj index 56bf3ac4..944a3cc6 100644 --- a/qs/org.jetbrains.kotlin/build/Build.csproj +++ b/qs/org.jetbrains.kotlin/build/Build.csproj @@ -12,7 +12,7 @@ - + diff --git a/qs/org.jfrog.cardinalcommerce.gradle--cardinalmobilesdk/build/Build.csproj b/qs/org.jfrog.cardinalcommerce.gradle--cardinalmobilesdk/build/Build.csproj index be416aa0..422ee008 100644 --- a/qs/org.jfrog.cardinalcommerce.gradle--cardinalmobilesdk/build/Build.csproj +++ b/qs/org.jfrog.cardinalcommerce.gradle--cardinalmobilesdk/build/Build.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Binderator.Gradle/ArtifactScanner.cs b/src/Binderator.Gradle/ArtifactScanner.cs index fecae69b..1da280f5 100644 --- a/src/Binderator.Gradle/ArtifactScanner.cs +++ b/src/Binderator.Gradle/ArtifactScanner.cs @@ -22,6 +22,9 @@ public static List Scan( "junit", "jsr305", }; + static readonly string[] skippedGroups = new[] { + "androidx.test" + }; public static List Scan( List existingArtifacts, @@ -167,14 +170,15 @@ public static List Scan( if (skippedDependencies.Contains(xartifactId)) continue; var xgroupId = dependency.SelectSingleNode("descendant::mvn:groupId", nsmgr).InnerText; + if(skippedGroups.Contains(xgroupId)) continue; if (string.IsNullOrWhiteSpace(scope)) { - var missed = missingDependencies.Any(x => - x == $"{xgroupId}:{xartifactId}:" || - x.StartsWith($"{xgroupId}:{xartifactId}:")); + //var missed = missingDependencies.Any(x => + // x == $"{xgroupId}:{xartifactId}:" || + // x.StartsWith($"{xgroupId}:{xartifactId}:")); - if (!missed) continue; + //if (!missed) continue; // TODO Why scope is N/A for a normal dependency scope = "compile"; @@ -398,16 +402,22 @@ private static ArtifactModel FindExternalArtifact(string basePath, string xgroup if (!Directory.Exists(externalArtifactFolderPath)) return null; - var nugetVersion = GetNugetVersion(externalArtifactFolderPath, xversion); - - if (nugetVersion == null) return null; - var externalArtifactNugetPath = Path.Combine( externalArtifactFolderPath, "nuget.json" ); using var stream = File.OpenRead(externalArtifactNugetPath); var nugetModel = stream.Deserialize(); + stream.Close(); + + if (!string.IsNullOrWhiteSpace(nugetModel.Relocated)) + { + var relocatedParts = nugetModel.Relocated.Split(':'); + return FindExternalArtifact(basePath, relocatedParts[0], relocatedParts[1], xversion); + } + + var nugetVersion = GetNugetVersion(externalArtifactFolderPath, xversion); + if (nugetVersion == null) return null; return new ArtifactModel { diff --git a/src/Binderator.Gradle/Engine.cs b/src/Binderator.Gradle/Engine.cs index 6264aac8..3d71463b 100644 --- a/src/Binderator.Gradle/Engine.cs +++ b/src/Binderator.Gradle/Engine.cs @@ -134,6 +134,8 @@ static List BuildProjectModels(BindingConfig config) static bool ShouldIncludeDependency(BindingConfig config, ArtifactModel artifact, KeyValuePair dependency, List exceptions) { + if (string.IsNullOrWhiteSpace(dependency.Value)) return true; + // We always care about 'compile' scoped dependencies if (string.Equals(dependency.Value, "compile", StringComparison.OrdinalIgnoreCase)) return true; diff --git a/src/Binderator.Gradle/Model/NugetModel.cs b/src/Binderator.Gradle/Model/NugetModel.cs index d8851318..3548c35f 100644 --- a/src/Binderator.Gradle/Model/NugetModel.cs +++ b/src/Binderator.Gradle/Model/NugetModel.cs @@ -4,5 +4,6 @@ namespace Binderator.Gradle; public class NugetModel { public string PackageId { get; set; } + public string Relocated { get; set; } } diff --git a/src/Dependencies.Gradle.Qs/Dependencies.Gradle.Qs.csproj b/src/Dependencies.Gradle.Qs/Dependencies.Gradle.Qs.csproj index 52d10a47..fc02d228 100644 --- a/src/Dependencies.Gradle.Qs/Dependencies.Gradle.Qs.csproj +++ b/src/Dependencies.Gradle.Qs/Dependencies.Gradle.Qs.csproj @@ -25,6 +25,6 @@ - + \ No newline at end of file diff --git a/src/MetadataFetcher.Tests/FetcherTests.cs b/src/MetadataFetcher.Tests/FetcherTests.cs index c058a5aa..3ed59f66 100644 --- a/src/MetadataFetcher.Tests/FetcherTests.cs +++ b/src/MetadataFetcher.Tests/FetcherTests.cs @@ -205,6 +205,8 @@ static FetcherTests() [InlineData("Xamarin.AndroidX.Lifecycle.Process", "androidx.lifecycle", "lifecycle-process")] [InlineData("Xamarin.AndroidX.RecyclerView", "androidx.recyclerview", "recyclerview")] [InlineData("Xamarin.AndroidX.Room.Runtime", "androidx.room", "room-runtime")] + [InlineData("Xamarin.AndroidX.Room.Common", "androidx.room", "room-common")] + [InlineData("Xamarin.AndroidX.Room.Room.Ktx", "androidx.room", "room-ktx")] [InlineData("Xamarin.AndroidX.SavedState", "androidx.savedstate", "savedstate")] [InlineData("Xamarin.AndroidX.SavedState.SavedState.Ktx", "androidx.savedstate", "savedstate-ktx")] [InlineData("Xamarin.AndroidX.Security.SecurityCrypto", "androidx.security", "security-crypto")] @@ -216,6 +218,7 @@ static FetcherTests() [InlineData("Square.OkHttp3.LoggingInterceptor", "com.squareup.okhttp3", "logging-interceptor")] [InlineData("Xamarin.Kotlin.StdLib", "org.jetbrains.kotlin", "kotlin-stdlib")] [InlineData("Xamarin.Kotlin.StdLib.Common", "org.jetbrains.kotlin", "kotlin-stdlib-common")] + [InlineData("Xamarin.Kotlin.Reflect", "org.jetbrains.kotlin", "kotlin-reflect")] [InlineData("Xamarin.Kotlin.StdLib.Jdk7", "org.jetbrains.kotlin", "kotlin-stdlib-jdk7")] [InlineData("Xamarin.Kotlin.StdLib.Jdk8", "org.jetbrains.kotlin", "kotlin-stdlib-jdk8")] [InlineData("Org.Jetbrains.Kotlin.KotlinAndroidExtensionsRuntime", "org.jetbrains.kotlin", "kotlin-android-extensions-runtime")] diff --git a/src/Project.cshtml b/src/Project.cshtml index 1bdfb1db..6887c950 100644 --- a/src/Project.cshtml +++ b/src/Project.cshtml @@ -219,7 +219,7 @@ } - + Transforms/Metadata.common.xml